exfat: simplify exfat_hint_femp structure
Subsystems (2)
PATCH 2/2 exfat: simplify exfat_hint_femp structure
The hint provided by exfat_hint_femp is that the cluster number is enough, so replace exfat_chain with the cluster number.
Signed-off-by Tetsuhiro Kohada <[email protected]>
--- fs/exfat/dir.c | 3 +-- fs/exfat/exfat_fs.h | 2 +- fs/exfat/namei.c | 19 ++++++------------- 3 files changed, 8 insertions(+), 16 deletions(-)
fs/exfat/dir.c +1 -2
@@ -978,8 +978,7 @@ int exfat_find_dir_entry(struct super_block *sb, struct exfat_inode_info *ei, num_empty++;if (candi_empty.eidx ==EXFAT_HINT_NONE && num_empty ==1 ) { -exfat_chain_set (&candi_empty.cur, - clu.dir, clu.size, clu.flags); + candi_empty.clu = clu.dir; } if (candi_empty.eidx == EXFAT_HINT_NONE &&
fs/exfat/exfat_fs.h +1 -1
@@ -153,7 +153,7 @@ struct exfat_hint_femp {/* count of continuous empty entry */ int count;/* the cluster that first empty slot exists in */ -struct exfat_chain cur; +unsigned int clu; };/* hint structure */
fs/exfat/namei.c +6 -13
@@ -202,10 +202,10 @@ static int exfat_search_empty_slot(struct super_block *sb, struct exfat_hint_femp *hint_femp, struct exfat_chain *p_dir, int num_entries) { - int i, dentry, num_empty = 0; + int i, dentry = 0, num_empty = 0;int dentries_per_clu;unsigned int type; -struct exfat_chain clu; +struct exfat_chain clu = *p_dir;struct exfat_dentry *ep;struct exfat_sb_info *sbi =EXFAT_SB (sb);struct buffer_head *bh;
@@ -218,11 +218,8 @@ static int exfat_search_empty_slot(struct super_block *sb, hint_femp->eidx =EXFAT_HINT_NONE ;return dentry; } - -exfat_chain_dup (&clu, &hint_femp->cur); - }else { -exfat_chain_dup (&clu, p_dir); - dentry =0 ; + clu.dir = hint_femp->clu; + clu.size -=EXFAT_B_TO_CLU (dentry *DENTRY_SIZE , sbi); }while (clu.dir !=EXFAT_EOF_CLUSTER ) {
@@ -240,8 +237,7 @@ static int exfat_search_empty_slot(struct super_block *sb,if (hint_femp->eidx ==EXFAT_HINT_NONE ) { hint_femp->eidx = dentry; hint_femp->count =CNT_UNUSED_NOHIT ; -exfat_chain_set (&hint_femp->cur, - clu.dir, clu.size, clu.flags); + hint_femp->clu = clu.dir; } if (type == TYPE_UNUSED &&
@@ -354,7 +350,6 @@ static int exfat_find_empty_entry(struct inode *inode,*/ exfat_chain_cont_cluster (sb, p_dir->dir, p_dir->size); p_dir->flags =ALLOC_FAT_CHAIN ; - hint_femp.cur.flags =ALLOC_FAT_CHAIN ; }if (clu.flags ==ALLOC_FAT_CHAIN )
@@ -367,10 +362,8 @@ static int exfat_find_empty_entry(struct inode *inode,*/ hint_femp.eidx =EXFAT_B_TO_DEN_IDX (p_dir->size, sbi); hint_femp.count = sbi->dentries_per_clu; - -exfat_chain_set (&hint_femp.cur, clu.dir,0 , clu.flags); + hint_femp.clu = clu.dir; } - hint_femp.cur.size++; p_dir->size++; size =EXFAT_CLU_TO_B (p_dir->size, sbi);
Signature · 1 line
2.25.1