298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-06-11 00:32:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

kernel: bump 5.10 to 5.10.231

Browse Source
This commit is contained in:
coolsnowwolf 2024-12-18 13:06:41 +08:00
parent af0a4aa4a4
commit cab2ab7d58
6 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/kernel-5.10
View File

@ -1,2 +1,2 @@
LINUX_VERSION-5.10 = .221 LINUX_VERSION-5.10 = .231
LINUX_KERNEL_HASH-5.10.221 = da1dd47febac4f7856654038a47703666da3afba348b8e96e39584e0972e2725 LINUX_KERNEL_HASH-5.10.231 = 565a4883cc460af9f338966fca51a84bcba13dc7e47a563e32639115cba79675

4
target/linux/generic/files-5.10/fs/ntfs3/bitmap.c
View File

@ -661,7 +661,7 @@ int wnd_init(struct wnd_bitmap *wnd, struct super_block *sb, size_t nbits)
wnd->total_zeroes = nbits; wnd->total_zeroes = nbits;
wnd->extent_max = MINUS_ONE_T; wnd->extent_max = MINUS_ONE_T;
wnd->zone_bit = wnd->zone_end = 0; wnd->zone_bit = wnd->zone_end = 0;
wnd->nwnd = bytes_to_block(sb, bitmap_size(nbits)); wnd->nwnd = bytes_to_block(sb, ntfs3_bitmap_size(nbits));
wnd->bits_last = nbits & (wbits - 1); wnd->bits_last = nbits & (wbits - 1);
if (!wnd->bits_last) if (!wnd->bits_last)
wnd->bits_last = wbits; wnd->bits_last = wbits;
@ -1323,7 +1323,7 @@ int wnd_extend(struct wnd_bitmap *wnd, size_t new_bits)
return -EINVAL; return -EINVAL;
/* Align to 8 byte boundary. */ /* Align to 8 byte boundary. */
new_wnd = bytes_to_block(sb, bitmap_size(new_bits)); new_wnd = bytes_to_block(sb, ntfs3_bitmap_size(new_bits));
new_last = new_bits & (wbits - 1); new_last = new_bits & (wbits - 1);
if (!new_last) if (!new_last)
new_last = wbits; new_last = wbits;

2
target/linux/generic/files-5.10/fs/ntfs3/fsntfs.c
View File

@ -493,7 +493,7 @@ static int ntfs_extend_mft(struct ntfs_sb_info *sbi)
ni->mi.dirty = true; ni->mi.dirty = true;
/* Step 2: Resize $MFT::BITMAP. */ /* Step 2: Resize $MFT::BITMAP. */
new_bitmap_bytes = bitmap_size(new_mft_total); new_bitmap_bytes = ntfs3_bitmap_size(new_mft_total);
err = attr_set_size(ni, ATTR_BITMAP, NULL, 0, &sbi->mft.bitmap.run, err = attr_set_size(ni, ATTR_BITMAP, NULL, 0, &sbi->mft.bitmap.run,
new_bitmap_bytes, &new_bitmap_bytes, true, NULL); new_bitmap_bytes, &new_bitmap_bytes, true, NULL);

11
target/linux/generic/files-5.10/fs/ntfs3/index.c
View File

@ -1360,8 +1360,8 @@ static int indx_create_allocate(struct ntfs_index *indx, struct ntfs_inode *ni,
alloc->nres.valid_size = alloc->nres.data_size = cpu_to_le64(data_size); alloc->nres.valid_size = alloc->nres.data_size = cpu_to_le64(data_size);
err = ni_insert_resident(ni, bitmap_size(1), ATTR_BITMAP, in->name, err = ni_insert_resident(ni, ntfs3_bitmap_size(1), ATTR_BITMAP,
in->name_len, &bitmap, NULL, NULL); in->name, in->name_len, &bitmap, NULL, NULL);
if (err) if (err)
goto out2; goto out2;
@ -1422,8 +1422,9 @@ static int indx_add_allocate(struct ntfs_index *indx, struct ntfs_inode *ni,
if (bmp) { if (bmp) {
/* Increase bitmap. */ /* Increase bitmap. */
err = attr_set_size(ni, ATTR_BITMAP, in->name, in->name_len, err = attr_set_size(ni, ATTR_BITMAP, in->name, in->name_len,
&indx->bitmap_run, bitmap_size(bit + 1), &indx->bitmap_run,
NULL, true, NULL); ntfs3_bitmap_size(bit + 1), NULL, true,
NULL);
if (err) if (err)
goto out1; goto out1;
} }
@ -1980,7 +1981,7 @@ static int indx_shrink(struct ntfs_index *indx, struct ntfs_inode *ni,
if (err) if (err)
return err; return err;
bpb = bitmap_size(bit); bpb = ntfs3_bitmap_size(bit);
if (bpb * 8 == nbits) if (bpb * 8 == nbits)
return 0; return 0;

5
target/linux/generic/files-5.10/fs/ntfs3/ntfs_fs.h
View File

@ -38,6 +38,7 @@ struct page;
struct writeback_control; struct writeback_control;
enum utf16_endian; enum utf16_endian;
#define BITS_TO_U64(nr) DIV_ROUND_UP(nr, BITS_PER_TYPE(u64))
#define MINUS_ONE_T ((size_t)(-1)) #define MINUS_ONE_T ((size_t)(-1))
/* Biggest MFT / smallest cluster */ /* Biggest MFT / smallest cluster */
@ -943,9 +944,9 @@ static inline bool run_is_empty(struct runs_tree *run)
} }
/* NTFS uses quad aligned bitmaps. */ /* NTFS uses quad aligned bitmaps. */
static inline size_t bitmap_size(size_t bits) static inline size_t ntfs3_bitmap_size(size_t bits)
{ {
return ALIGN((bits + 7) >> 3, 8); return BITS_TO_U64(bits) * sizeof(u64);
} }
#define _100ns2seconds 10000000 #define _100ns2seconds 10000000

2
target/linux/generic/files-5.10/fs/ntfs3/super.c
View File

@ -1095,7 +1095,7 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc)
/* Check bitmap boundary. */ /* Check bitmap boundary. */
tt = sbi->used.bitmap.nbits; tt = sbi->used.bitmap.nbits;
if (inode->i_size < bitmap_size(tt)) { if (inode->i_size < ntfs3_bitmap_size(tt)) {
err = -EINVAL; err = -EINVAL;
goto put_inode_out; goto put_inode_out;
} }