fs/ntfs3: Bugfix and refactoring
Subsystems (2)
Konstantin Komarov
maintainercover fs/ntfs3: Bugfix and refactoring
[PATCH 0/4] fs/ntfs3: Bugfix and refactoring
First part of fixes and refactoring for ntfs3.
These patches must be applied after series
"fs/ntfs3: Fixes for big endian systems", that was missed by me.
Konstantin Komarov (4):
fs/ntfs3: Add ntfs_bitmap_weight_le function and refactoring fs/ntfs3: Fix sparse problems
fs/ntfs3: Remove unused functions
fs/ntfs3: Simplify ntfs_update_mftmirr function
fs/ntfs3/attrib.c | 34 ++------------- fs/ntfs3/bitfunc.c | 4 +- fs/ntfs3/bitmap.c | 100 +++++++++++++++++++++++++-------------------- fs/ntfs3/dir.c | 4 +- fs/ntfs3/frecord.c | 3 +- fs/ntfs3/fsntfs.c | 33 +-------------- fs/ntfs3/namei.c | 13 +++--- fs/ntfs3/ntfs_fs.h | 13 +++--- 8 files changed, 77 insertions(+), 127 deletions(-)
Signature · 1 line
2.37.0
Konstantin Komarov
maintainerPATCH 1/4 fs/ntfs3: Add ntfs_bitmap_weight_le function and refactoring
Added ntfs_bitmap_weight_le function.
Changed argument types of bits/bitmap functions.
--- fs/ntfs3/bitfunc.c | 4 +- fs/ntfs3/bitmap.c | 100 +++++++++++++++++++++++++-------------------- fs/ntfs3/ntfs_fs.h | 11 ++--- 3 files changed, 63 insertions(+), 52 deletions(-)
fs/ntfs3/bitfunc.c +2 -2
@@ -30,7 +30,7 @@ static const u8 zero_mask[] = { 0xFF, 0xFE, 0xFC, 0xF8, 0xF0,* * Return: True if all bits [bit, bit+nbits) are zeros "0". */ -bool are_bits_clear (const ulong *lmap,size_t bit,size_t nbits) +bool are_bits_clear (const void *lmap,size_t bit,size_t nbits) {size_t pos = bit &7 ;const u8 *map = (u8 *)lmap + (bit >>3 );
@@ -78,7 +78,7 @@ bool are_bits_clear(const ulong *lmap, size_t bit, size_t nbits)* * Return: True if all bits [bit, bit+nbits) are ones "1". */ -bool are_bits_set (const ulong *lmap,size_t bit,size_t nbits) +bool are_bits_set (const void *lmap,size_t bit,size_t nbits) {u8 mask;size_t pos = bit &7 ;
fs/ntfs3/bitmap.c +55 -45
257 lines not on this page · raw message
fs/ntfs3/ntfs_fs.h +6 -5
@@ -471,9 +471,9 @@ static inline size_t al_aligned(size_t size) }/* Globals from bitfunc.c */ -bool are_bits_clear (const ulong *map,size_t bit,size_t nbits); -bool are_bits_set (const ulong *map,size_t bit,size_t nbits); -size_t get_set_bits_ex (const ulong *map,size_t bit,size_t nbits); +bool are_bits_clear (const void *map,size_t bit,size_t nbits); +bool are_bits_set (const void *map,size_t bit,size_t nbits); +size_t get_set_bits_ex (const void *map,size_t bit,size_t nbits);/* Globals from dir.c */ int ntfs_utf16_to_nls(struct ntfs_sb_info *sbi, const __le16 *name, u32 len,
@@ -837,8 +837,9 @@ int wnd_extend(struct wnd_bitmap *wnd, size_t new_bits);void wnd_zone_set (struct wnd_bitmap *wnd,size_t Lcn,size_t Len);int ntfs_trim_fs (struct ntfs_sb_info *sbi,struct fstrim_range *range); -void ntfs_bitmap_set_le (unsigned long *map,unsigned int start,int len); -void ntfs_bitmap_clear_le (unsigned long *map,unsigned int start,int len); +void ntfs_bitmap_set_le (void *map,unsigned int start,int len); +void ntfs_bitmap_clear_le (void *map,unsigned int start,int len); +unsigned int ntfs_bitmap_weight_le (const void *bitmap,int bits);/* Globals from upcase.c */ int ntfs_cmp_names(const __le16 *s1, size_t l1, const __le16 *s2, size_t l2,
Signature · 1 line
2.37.0
Konstantin Komarov
maintainerPATCH 2/4 fs/ntfs3: Fix sparse problems
In reply to Konstantin KomarovFixing various problems, detected by sparse.
--- fs/ntfs3/attrib.c | 7 ++++--- fs/ntfs3/dir.c | 4 ++-- fs/ntfs3/frecord.c | 3 +-- fs/ntfs3/namei.c | 13 ++++++------- 4 files changed, 13 insertions(+), 14 deletions(-)
fs/ntfs3/attrib.c +4 -3
@@ -2308,7 +2308,8 @@ int attr_insert_range(struct ntfs_inode *ni, u64 vbo, u64 bytes)if (!attr_b->non_res) {/* Still resident. */ -char *data =Add2Ptr (attr_b, attr_b->res.data_off); +char *data =Add2Ptr (attr_b, +le16_to_cpu (attr_b->res.data_off));memmove (data + bytes, data, bytes);memset (data,0 , bytes);
@@ -2400,8 +2401,8 @@ int attr_insert_range(struct ntfs_inode *ni, u64 vbo, u64 bytes)if (vbo <= ni->i_valid) ni->i_valid += bytes; - attr_b->nres.data_size =le64_to_cpu (data_size + bytes); - attr_b->nres.alloc_size =le64_to_cpu (alloc_size + bytes); + attr_b->nres.data_size =cpu_to_le64 (data_size + bytes); + attr_b->nres.alloc_size =cpu_to_le64 (alloc_size + bytes);/* ni->valid may be not equal valid_size (temporary). */ if (ni->i_valid > data_size + bytes)
fs/ntfs3/dir.c +2 -2
@@ -26,8 +26,8 @@ int ntfs_utf16_to_nls(struct ntfs_sb_info *sbi, const __le16 *name, u32 len,if (!nls) {/* UTF-16 -> UTF-8 */ - ret =utf16s_to_utf8s (name, len,UTF16_LITTLE_ENDIAN , buf, - buf_len); + ret =utf16s_to_utf8s ((wchar_t *)name, len,UTF16_LITTLE_ENDIAN , + buf, buf_len); buf[ret] ='\0' ;return ret; }
fs/ntfs3/frecord.c +1 -2
@@ -1670,8 +1670,7 @@ struct ATTR_FILE_NAME *ni_fname_name(struct ntfs_inode *ni, goto next; fns = (struct le_str *)&fname->name_len; -if (ntfs_cmp_names (uni->name, uni->len, fns->name, fns->len,NULL , - false)) +if (ntfs_cmp_names_cpu (uni, fns,NULL , false)) goto next;return fname;
fs/ntfs3/namei.c +6 -7
@@ -427,7 +427,8 @@ static int ntfs_d_compare(const struct dentry *dentry, unsigned int len1,unsigned int len2 = name->len;unsigned int lm =min (len1, len2);unsigned char c1, c2; -struct cpu_str *uni1, *uni2; +struct cpu_str *uni1; +struct le_str *uni2;/* First try fast implementation. */ for (;;) {
@@ -468,8 +469,9 @@ static int ntfs_d_compare(const struct dentry *dentry, unsigned int len1, uni2 =Add2Ptr (uni1,2048 ); - ret =ntfs_nls_to_utf16 (sbi, name->name, name->len, uni2,NTFS_NAME_LEN , -UTF16_HOST_ENDIAN ); + ret =ntfs_nls_to_utf16 (sbi, name->name, name->len, + (struct cpu_str *)uni2,NTFS_NAME_LEN , +UTF16_LITTLE_ENDIAN );if (ret <0 ) goto out;
@@ -478,10 +480,7 @@ static int ntfs_d_compare(const struct dentry *dentry, unsigned int len1, goto out; } - ret = !ntfs_cmp_names (uni1->name, uni1->len, uni2->name, uni2->len, - sbi->upcase, false) - ?0 - :1 ; + ret = !ntfs_cmp_names_cpu (uni1, uni2, sbi->upcase, false) ?0 :1 ; out:__putname (uni1);
Signature · 1 line
2.37.0
Konstantin Komarov
maintainerPATCH 3/4 fs/ntfs3: Remove unused functions
In reply to Konstantin KomarovRemoved attr_must_be_resident and ntfs_query_def.
--- fs/ntfs3/attrib.c | 27 --------------------------- fs/ntfs3/fsntfs.c | 29 ----------------------------- fs/ntfs3/ntfs_fs.h | 2 -- 3 files changed, 58 deletions(-)
fs/ntfs3/attrib.c +0 -27
@@ -54,33 +54,6 @@ static inline u64 get_pre_allocated(u64 size)return ret; } -/* -* attr_must_be_resident -* -* Return: True if attribute must be resident. -*/ -static inline bool attr_must_be_resident (struct ntfs_sb_info *sbi, -enum ATTR_TYPE type) -{ -const struct ATTR_DEF_ENTRY *de; - -switch (type) { -case ATTR_STD : -case ATTR_NAME : -case ATTR_ID : -case ATTR_LABEL : -case ATTR_VOL_INFO : -case ATTR_ROOT : -case ATTR_EA_INFO : -return true; -default : - de =ntfs_query_def (sbi, type); -if (de && (de->flags &NTFS_ATTR_MUST_BE_RESIDENT )) -return true; -return false; - } -} -/* * attr_load_runs - Load all runs stored in @attr. */
fs/ntfs3/fsntfs.c +0 -29
@@ -321,35 +321,6 @@ int ntfs_loadlog_and_replay(struct ntfs_inode *ni, struct ntfs_sb_info *sbi)return err; } -/* -* ntfs_query_def -* -* Return: Current ATTR_DEF_ENTRY for given attribute type. -*/ -const struct ATTR_DEF_ENTRY *ntfs_query_def (struct ntfs_sb_info *sbi, -enum ATTR_TYPE type) -{ -int type_in =le32_to_cpu (type); -size_t min_idx =0 ; -size_t max_idx = sbi->def_entries -1 ; - -while (min_idx <= max_idx) { -size_t i = min_idx + ((max_idx - min_idx) >>1 ); -const struct ATTR_DEF_ENTRY *entry = sbi->def_table + i; -int diff =le32_to_cpu (entry->type) - type_in; - -if (!diff) -return entry; -if (diff <0 ) - min_idx = i +1 ; -else if (i) - max_idx = i -1 ; -else -return NULL ; - } -return NULL ; -} -/* * ntfs_look_for_free_space - Look for a free space in bitmap. */
fs/ntfs3/ntfs_fs.h +0 -2
@@ -584,8 +584,6 @@ int ntfs_fix_post_read(struct NTFS_RECORD_HEADER *rhdr, size_t bytes, bool simple);int ntfs_extend_init (struct ntfs_sb_info *sbi);int ntfs_loadlog_and_replay (struct ntfs_inode *ni,struct ntfs_sb_info *sbi); -const struct ATTR_DEF_ENTRY *ntfs_query_def (struct ntfs_sb_info *sbi, -enum ATTR_TYPE Type);int ntfs_look_for_free_space (struct ntfs_sb_info *sbi,CLST lcn,CLST len,CLST *new_lcn,CLST *new_len,enum ALLOCATE_OPT opt);
Signature · 1 line
2.37.0
Konstantin Komarov
maintainerPATCH 4/4 fs/ntfs3: Simplify ntfs_update_mftmirr function
In reply to Konstantin KomarovMake err assignment in one place.
--- fs/ntfs3/fsntfs.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
fs/ntfs3/fsntfs.c +1 -3
@@ -801,7 +801,6 @@ void ntfs_update_mftmirr(struct ntfs_sb_info *sbi, int wait)if (!(sbi->flags &NTFS_FLAGS_MFTMIRR ))return ; - err =0 ; bytes = sbi->mft.recs_mirr << sbi->record_bits; block1 = sbi->mft.lbo >> sb->s_blocksize_bits; block2 = sbi->mft.lbo2 >> sb->s_blocksize_bits;
@@ -831,8 +830,7 @@ void ntfs_update_mftmirr(struct ntfs_sb_info *sbi, int wait)put_bh (bh1); bh1 =NULL ; -if (wait) - err =sync_dirty_buffer (bh2); + err = wait ?sync_dirty_buffer (bh2) :0 ;put_bh (bh2);if (err)
Signature · 1 line
2.37.0