exfat: remove 'rwoffset' in exfat_inode_info
Subsystems (2)
PATCH 1/1 exfat: remove 'rwoffset' in exfat_inode_info
Remove 'rwoffset' in exfat_inode_info and replace it with the parameter(cpos) of exfat_readdir. Since rwoffset of is referenced only by exfat_readdir, it is not necessary a exfat_inode_info's member.
--- fs/exfat/dir.c | 16 ++++++---------- fs/exfat/exfat_fs.h | 2 -- fs/exfat/file.c | 2 -- fs/exfat/inode.c | 3 --- fs/exfat/super.c | 1 - 5 files changed, 6 insertions(+), 18 deletions(-)
fs/exfat/dir.c +6 -10
@@ -59,7 +59,7 @@ 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 ;unsigned int type, clu_offset;
@@ -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 */
@@ -162,7 +162,7 @@ static int exfat_readdir(struct inode *inode, struct exfat_dir_entry *dir_entry) ei->hint_bmap.off = dentry >> dentries_per_clu_bits; ei->hint_bmap.clu = clu.dir; - ei->rwoffset = ++dentry; + *cpos =EXFAT_DEN_TO_B (++dentry);return 0 ; }
@@ -178,7 +178,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 +242,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 +260,11 @@ 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 ); + (EXFAT_B_TO_DEN (cpos-1 ) &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
Sungjong Seo
maintainerQuoted 18 lines
Remove 'rwoffset' in
exfat_inode_infoand replace it with the parameter(cpos) ofexfat_readdir.
Since rwoffset of is referenced only byexfat_readdir, it is not necessary a exfat_inode_info's member.Signed-off-by Tetsuhiro Kohada <[email protected]>--- fs/exfat/dir.c | 16 ++++++---------- fs/exfat/exfat_fs.h | 2 -- fs/exfat/file.c | 2 -- fs/exfat/inode.c | 3 --- fs/exfat/super.c | 1 - 5 files changed, 6 insertions(+), 18 deletions(-)fs/exfat/dir.c index renamed from fs/exfat/dir.c +0
-0
a9b13ae3f325..fa5bb72aa295100644fs/exfat/dir.c +0
-0
[snip]
fs/exfat/dir.c static int exfat_iterate(struct file *filp, struct dir_context *ctx) · line 267
Quoted 13 lines
sector @@ -262,13 +260,11 @@ static int
exfat_iterate(struct file *filp, struct dir_context *ctx)fs/exfat/dir.c +1
-3goto 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 ); + (EXFAT_B_TO_DEN (cpos-1 ) &0xffffffff );
Need to fix the above line to be:
(EXFAT_B_TO_DEN(cpos)-1)) & 0xffffffff);
Quoted 29 lines · Sungjong Seo
Quoted 18 lines
Remove 'rwoffset' in
exfat_inode_infoand replace it with the parameter(cpos) ofexfat_readdir.
Since rwoffset of is referenced only byexfat_readdir, it is not necessary a exfat_inode_info's member.Signed-off-by Tetsuhiro Kohada <[email protected]>--- fs/exfat/dir.c | 16 ++++++---------- fs/exfat/exfat_fs.h | 2 -- fs/exfat/file.c | 2 -- fs/exfat/inode.c | 3 --- fs/exfat/super.c | 1 - 5 files changed, 6 insertions(+), 18 deletions(-)fs/exfat/dir.c index renamed from fs/exfat/dir.c +0
-0
a9b13ae3f325..fa5bb72aa295100644fs/exfat/dir.c +0
-0[snip]
Quoted 10 lines
sector @@ -262,13 +260,11 @@ static int
exfat_iterate(struct file *filp, struct dir_context *ctx)
gotoend_of_dir;
}fs/exfat/dir.c +0
-2- cpos =EXFAT_DEN_TO_B (ei->rwoffset); -if (!nb->lfn[0 ]) goto end_of_dir;
Quoted 6 lines
fs/exfat/dir.c static int exfat_iterate(struct file *filp, struct dir_context *ctx) · line 267
Quoted 3 lines
i_pos= ((loff_t)ei->start_clu << 32) |fs/exfat/dir.c +1
-1- ((ei->rwoffset -1 ) &0xffffffff ); + (EXFAT_B_TO_DEN (cpos-1 ) &0xffffffff );Need to fix the above line to be:
(EXFAT_B_TO_DEN(cpos)-1)) &0xffffffff);
Here, we simply converted so that the calculation results would be the same. But after reading it carefully again, I noticed.
- Why use the previous entry?
- Why does cpos point to stream dir-entry in entry-set?
For the former, there is no need to "++dentry" in exfat_readdir(). For the latter, I think cpos should point to the next to current entry-set.
I'll make V2 considering these.
How do you think?
BR
---
Tetsuhiro Kohada <[email protected]>
Sungjong Seo
maintainerQuoted 44 lines · Sungjong Seo
Quoted 29 lines
Quoted 18 lines
Remove 'rwoffset' in
exfat_inode_infoand replace it with the parameter(cpos) ofexfat_readdir.
Since rwoffset of is referenced only byexfat_readdir, it is not necessary a exfat_inode_info's member.Signed-off-by Tetsuhiro Kohada <[email protected]>--- fs/exfat/dir.c | 16 ++++++---------- fs/exfat/exfat_fs.h | 2 -- fs/exfat/file.c | 2 -- fs/exfat/inode.c | 3 --- fs/exfat/super.c | 1 - 5 files changed, 6 insertions(+), 18 deletions(-)fs/exfat/dir.c index renamed from fs/exfat/dir.c +0
-0
a9b13ae3f325..fa5bb72aa295100644fs/exfat/dir.c +0
-0[snip]
Quoted 10 lines
sector @@ -262,13 +260,11 @@ static int
exfat_iterate(struct file *filp, struct dir_context *ctx)
gotoend_of_dir;
}fs/exfat/dir.c +0
-2- cpos =EXFAT_DEN_TO_B (ei->rwoffset); -if (!nb->lfn[0 ]) goto end_of_dir;Quoted 6 lines
fs/exfat/dir.c static int exfat_iterate(struct file *filp, struct dir_context *ctx) · line 267
Quoted 3 lines
i_pos= ((loff_t)ei->start_clu << 32) |fs/exfat/dir.c +1
-1- ((ei->rwoffset -1 ) &0xffffffff ); + (EXFAT_B_TO_DEN (cpos-1 ) &0xffffffff );Need to fix the above line to be:
(EXFAT_B_TO_DEN(cpos)-1)) &0xffffffff);Here, we simply converted so that the calculation results would be the same.
But after reading it carefully again, I noticed.
- Why use the previous entry?
- Why does cpos point to stream dir-entry in entry-set?
Quoted 5 lines
For the former, there is no need to "++dentry" in
exfat_readdir(). For the latter, I think cpos should point to the next to current entry-set.I'll make V2 considering these.
How do you think?
The latter looks better.
Quoted 4 lines
BR
---
Tetsuhiro Kohada <[email protected]>