exfat: remove 'rwoffset' in exfat_inode_info
Subsystems (2)
PATCH v2 1/1 exfat: remove 'rwoffset' in exfat_inode_info
Remove 'rwoffset' in exfat_inode_info and replace it with the parameter of exfat_readdir().
Since rwoffset is referenced only by exfat_readdir(), it is not necessary a exfat_inode_info's member.
Also, change cpos to point to the next of entry-set, and return the index of dir-entry via dir_entry->entry.
---
Changes in v2
- 'cpos' point to the next of entry-set
- return the index of dir-entry via dir_entry->entry
- fix commit-message
fs/exfat/dir.c | 21 +++++++++------------ fs/exfat/exfat_fs.h | 2 -- fs/exfat/file.c | 2 -- fs/exfat/inode.c | 3 --- fs/exfat/super.c | 1 - 5 files changed, 9 insertions(+), 20 deletions(-)
fs/exfat/dir.c +9 -12
@@ -59,9 +59,9 @@ static void exfat_get_uniname_from_ext_entry(struct super_block *sb, }/* read a directory entry from the opened directory */ -static int exfat_readdir (struct inode *inode,struct exfat_dir_entry *dir_entry) +static int exfat_readdir (struct inode *inode,loff_t *cpos,struct exfat_dir_entry *dir_entry) { -int i, dentries_per_clu, dentries_per_clu_bits =0 ; +int i, dentries_per_clu, dentries_per_clu_bits =0 , num_ext;unsigned int type, clu_offset;sector_t sector;struct exfat_chain dir, clu;
@@ -70,7 +70,7 @@ static int exfat_readdir(struct inode *inode, struct exfat_dir_entry *dir_entry)struct super_block *sb = inode->i_sb;struct exfat_sb_info *sbi =EXFAT_SB (sb);struct exfat_inode_info *ei =EXFAT_I (inode); -unsigned int dentry = ei->rwoffset &0xFFFFFFFF ; +unsigned int dentry =EXFAT_B_TO_DEN (*cpos) &0xFFFFFFFF ;struct buffer_head *bh;/* check if the given file ID is opened */
@@ -127,6 +127,7 @@ static int exfat_readdir(struct inode *inode, struct exfat_dir_entry *dir_entry)continue ; } + num_ext = ep->dentry.file.num_ext; dir_entry->attr =le16_to_cpu (ep->dentry.file.attr); exfat_get_entry_time(sbi, &dir_entry->crtime, ep->dentry.file.create_tz,
@@ -157,12 +158,13 @@ static int exfat_readdir(struct inode *inode, struct exfat_dir_entry *dir_entry)return -EIO ; dir_entry->size =le64_to_cpu (ep->dentry.stream.valid_size); + dir_entry->entry = dentry;brelse (bh); ei->hint_bmap.off = dentry >> dentries_per_clu_bits; ei->hint_bmap.clu = clu.dir; - ei->rwoffset = ++dentry; + *cpos =EXFAT_DEN_TO_B (dentry +1 + num_ext);return 0 ; }
@@ -178,7 +180,7 @@ static int exfat_readdir(struct inode *inode, struct exfat_dir_entry *dir_entry) } dir_entry->namebuf.lfn[0 ] ='\0' ; - ei->rwoffset = dentry; + *cpos =EXFAT_DEN_TO_B (dentry);return 0 ; }
@@ -242,12 +244,10 @@ static int exfat_iterate(struct file *filp, struct dir_context *ctx)if (err) goto unlock; get_new: - ei->rwoffset =EXFAT_B_TO_DEN (cpos); -if (cpos >=i_size_read (inode)) goto end_of_dir; - err =exfat_readdir (inode, &de); + err =exfat_readdir (inode, &cpos, &de);if (err) {/* * At least we tried to read a sector. Move cpos to next sector
@@ -262,13 +262,10 @@ static int exfat_iterate(struct file *filp, struct dir_context *ctx) goto end_of_dir; } - cpos =EXFAT_DEN_TO_B (ei->rwoffset); -if (!nb->lfn[0 ]) goto end_of_dir; - i_pos = ((loff_t )ei->start_clu <<32 ) | - ((ei->rwoffset -1 ) &0xffffffff ); + i_pos = ((loff_t )ei->start_clu <<32 ) | (de.entry &0xffffffff ); tmp =exfat_iget (sb, i_pos);if (tmp) { inum = tmp->i_ino;
fs/exfat/exfat_fs.h +0 -2
@@ -263,8 +263,6 @@ struct exfat_inode_info {* the validation of hint_stat. */ unsigned int version; -/* file offset or dentry index for readdir */ -loff_t rwoffset;/* hint for cluster last accessed */ struct exfat_hint hint_bmap;
fs/exfat/file.c +0 -2
@@ -208,8 +208,6 @@ int __exfat_truncate(struct inode *inode, loff_t new_size)/* hint information */ ei->hint_bmap.off =EXFAT_EOF_CLUSTER ; ei->hint_bmap.clu =EXFAT_EOF_CLUSTER ; -if (ei->rwoffset > new_size) - ei->rwoffset = new_size;/* hint_stat will be used if this is directory. */ ei->hint_stat.eidx =0 ;
fs/exfat/inode.c +0 -3
@@ -114,8 +114,6 @@ static int exfat_map_cluster(struct inode *inode, unsigned int clu_offset,unsigned int local_clu_offset = clu_offset;unsigned int num_to_be_allocated =0 , num_clusters =0 ; - ei->rwoffset =EXFAT_CLU_TO_B (clu_offset, sbi); -if (EXFAT_I (inode)->i_size_ondisk >0 ) num_clusters = EXFAT_B_TO_CLU_ROUND_UP(EXFAT_I(inode)->i_size_ondisk,
@@ -567,7 +565,6 @@ static int exfat_fill_inode(struct inode *inode, struct exfat_dir_entry *info) ei->hint_stat.eidx =0 ; ei->hint_stat.clu = info->start_clu; ei->hint_femp.eidx =EXFAT_HINT_NONE ; - ei->rwoffset =0 ; ei->hint_bmap.off =EXFAT_EOF_CLUSTER ; ei->i_pos =0 ;
fs/exfat/super.c +0 -1
@@ -342,7 +342,6 @@ static int exfat_read_root(struct inode *inode) ei->flags =ALLOC_FAT_CHAIN ; ei->type =TYPE_DIR ; ei->version =0 ; - ei->rwoffset =0 ; ei->hint_bmap.off =EXFAT_EOF_CLUSTER ; ei->hint_stat.eidx =0 ; ei->hint_stat.clu = sbi->root_dir;
Signature · 1 line
2.25.1
Quoted 8 lines
Remove 'rwoffset' in
exfat_inode_infoand replace it with the parameter ofexfat_readdir().
Since rwoffset is referenced only byexfat_readdir(), it is not necessary a exfat_inode_info's member.
Also, change cpos to point to the next of entry-set, and return the index of dir-entry viadir_entry->entry.Signed-off-by Tetsuhiro Kohada <[email protected]>
Quoted 139 lines
---
Changes in v2
- 'cpos' point to the next of entry-set
- return the index of dir-entry viadir_entry->entry
- fix commit-messagefs/exfat/dir.c | 21 +++++++++------------ fs/exfat/exfat_fs.h | 2 -- fs/exfat/file.c | 2 -- fs/exfat/inode.c | 3 --- fs/exfat/super.c | 1 - 5 files changed, 9 insertions(+), 20 deletions(-)fs/exfat/dir.c index renamed from fs/exfat/dir.c +0
-0
a9b13ae3f325..82bee625549d100644fs/exfat/dir.c +4
-2@@ -59,9 +59,9 @@ static void exfat_get_uniname_from_ext_entry(struct super_block *sb, } /* read a directory entry from the opened directory */ -static intexfat_readdir (struct inode *inode,struct exfat_dir_entry *dir_entry) +static int exfat_readdir(struct inode *inode, loff_t *cpos, struct +exfat_dir_entry *dir_entry) { -int i, dentries_per_clu, dentries_per_clu_bits =0 ; +int i, dentries_per_clu, dentries_per_clu_bits =0 , num_ext;unsigned int type, clu_offset;sector_t sector;struct exfat_chain dir, clu;@@ -70,7 +70,7 @@ static int exfat_readdir(struct inode *inode, struct exfat_dir_entry *dir_entry)struct super_block *sb = inode->i_sb;struct exfat_sb_info *sbi =EXFAT_SB (sb);struct exfat_inode_info *ei =EXFAT_I (inode); -unsigned int dentry = ei->rwoffset &0xFFFFFFFF ; +unsigned int dentry =EXFAT_B_TO_DEN (*cpos) &0xFFFFFFFF ;struct buffer_head *bh;/* check if the given file ID is opened */ @@ -127,6 +127,7 @@
static intexfat_readdir(struct inode *inode, struct exfat_dir_entry *dir_entry)fs/exfat/dir.c +5
-5continue ; } + num_ext = ep->dentry.file.num_ext; dir_entry->attr =le16_to_cpu (ep->dentry.file.attr); exfat_get_entry_time(sbi, &dir_entry->crtime, ep->dentry.file.create_tz,@@ -157,12 +158,13 @@ static int exfat_readdir(struct inode *inode, struct exfat_dir_entry *dir_entry)return -EIO ; dir_entry->size =le64_to_cpu (ep->dentry.stream.valid_size); + dir_entry->entry = dentry;brelse (bh); ei->hint_bmap.off = dentry >> dentries_per_clu_bits; ei->hint_bmap.clu = clu.dir; - ei->rwoffset = ++dentry; + *cpos =EXFAT_DEN_TO_B (dentry +1 + num_ext);return 0 ; }@@ -178,7 +180,7 @@ static int exfat_readdir(struct inode *inode, struct exfat_dir_entry *dir_entry) } dir_entry->namebuf.lfn[0 ] ='\0' ; - ei->rwoffset = dentry; + *cpos =EXFAT_DEN_TO_B (dentry);return 0 ; }@@ -242,12 +244,10 @@ static int exfat_iterate(struct file *filp, struct dir_context *ctx)if (err) goto unlock; get_new: - ei->rwoffset =EXFAT_B_TO_DEN (cpos); -if (cpos >=i_size_read (inode)) goto end_of_dir; - err =exfat_readdir (inode, &de); + err =exfat_readdir (inode, &cpos, &de);if (err) {/* * At least we tried to read a sector. Move cpos to next
sector @@ -262,13 +262,10 @@ static intexfat_iterate(struct file *filp, struct dir_context *ctx)fs/exfat/dir.c +1
-4goto end_of_dir; } - cpos =EXFAT_DEN_TO_B (ei->rwoffset); -if (!nb->lfn[0 ]) goto end_of_dir; - i_pos = ((loff_t )ei->start_clu <<32 ) | - ((ei->rwoffset -1 ) &0xffffffff ); + i_pos = ((loff_t )ei->start_clu <<32 ) | (de.entry &0xffffffff ); tmp =exfat_iget (sb, i_pos);if (tmp) { inum = tmp->i_ino;fs/exfat/exfat_fs.h index renamed from fs/exfat/exfat_fs.h +0
-0
44dc04520175..e586daf5a2e7100644fs/exfat/exfat_fs.h +0
-2@@ -263,8 +263,6 @@ struct exfat_inode_info {* the validation of hint_stat. */ unsigned int version; -/* file offset or dentry index for readdir */ -loff_t rwoffset;/* hint for cluster last accessed */ struct exfat_hint hint_bmap;fs/exfat/file.c index renamed from fs/exfat/file.c +0
-0
4831a39632a1..a92478eabfa4100644fs/exfat/file.c +0
-2@@ -208,8 +208,6 @@ int __exfat_truncate(struct inode *inode, loff_t new_size)/* hint information */ ei->hint_bmap.off = EXFAT_EOF_CLUSTER; ei->hint_bmap.clu =EXFAT_EOF_CLUSTER ; -if (ei->rwoffset > new_size) - ei->rwoffset = new_size;/* hint_stat will be used if this is directory. */ fs/exfat/file.c +0
-0ei->hint_stat.eidx =0 ;fs/exfat/inode.c index renamed from fs/exfat/inode.c +0
-0
7f90204adef5..70a33d4807c3100644
fs/exfat/inode.c static int exfat_map_cluster(struct inode *inode, · line 119
Quoted 8 lines
fs/exfat/inode.c +0
-2@@ -114,8 +114,6 @@ static int exfat_map_cluster(struct inode *inode,unsigned int clu_offset, unsigned int local_clu_offset = clu_offset;unsigned int num_to_be_allocated =0 , num_clusters =0 ; - ei->rwoffset =EXFAT_CLU_TO_B (clu_offset, sbi); -if (EXFAT_I (inode)->i_size_ondisk >0 ) num_clusters =
EXFAT_B_TO_CLU_ROUND_UP(EXFAT_I(inode)->i_size_ondisk,
Quoted 23 lines
fs/exfat/inode.c +0
-1@@ -567,7 +565,6 @@ static int exfat_fill_inode(struct inode *inode, struct exfat_dir_entry *info) ei->hint_stat.eidx = 0; ei->hint_stat.clu = info->start_clu; ei->hint_femp.eidx =EXFAT_HINT_NONE ; - ei->rwoffset =0 ; ei->hint_bmap.off =EXFAT_EOF_CLUSTER ; ei->i_pos =0 ;fs/exfat/super.c index renamed from fs/exfat/super.c +0
-0
3b6a1659892f..b29935a91b9b100644fs/exfat/super.c +0
-2@@ -342,7 +342,6 @@ static int exfat_read_root(struct inode *inode) ei->flags =ALLOC_FAT_CHAIN ; ei->type =TYPE_DIR ; ei->version =0 ; - ei->rwoffset =0 ; ei->hint_bmap.off =EXFAT_EOF_CLUSTER ; ei->hint_stat.eidx =0 ; ei->hint_stat.clu = sbi->root_dir; --2.25.1
Namjae Jeon
AppliedQuoted 10 lines
Quoted 8 lines
Remove 'rwoffset' in
exfat_inode_infoand replace it with the parameter ofexfat_readdir().
Since rwoffset is referenced only byexfat_readdir(), it is not necessary a exfat_inode_info's member.
Also, change cpos to point to the next of entry-set, and return the index of dir-entry viadir_entry->entry.Signed-off-by Tetsuhiro Kohada <[email protected]>Acked-by Sungjong Seo <[email protected]>
Applied, Thanks for your patch!