Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e112dbc4 authored by Yuezhang Mo's avatar Yuezhang Mo Committed by Namjae Jeon
Browse files

exfat: remove call ilog2() from exfat_readdir() 



There is no need to call ilog2() for the conversions between
cluster and dentry in exfat_readdir(), because these conversions
can be replaced with EXFAT_DEN_TO_CLU()/EXFAT_CLU_TO_DEN().

Code refinement, no functional changes.

Signed-off-by: default avatarYuezhang Mo <Yuezhang.Mo@sony.com>
Reviewed-by: default avatarAndy Wu <Andy.Wu@sony.com>
Reviewed-by: default avatarAoyama Wataru <wataru.aoyama@sony.com>
Reviewed-by: default avatarSungjong Seo <sj1557.seo@samsung.com>
Signed-off-by: default avatarNamjae Jeon <linkinjeon@kernel.org>
parent 2bb461ce

dir.c

+4 −5
Original line number Diff line number Diff line
@@ -62,7 +62,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, loff_t *cpos, struct exfat_dir_entry *dir_entry)

{

	int i, dentries_per_clu, dentries_per_clu_bits = 0, num_ext;

	int i, dentries_per_clu, num_ext;

	unsigned int type, clu_offset, max_dentries;

	struct exfat_chain dir, clu;

	struct exfat_uni_name uni_name;
@@ -84,11 +84,10 @@ static int exfat_readdir(struct inode *inode, loff_t *cpos, struct exfat_dir_ent 
			EXFAT_B_TO_CLU(i_size_read(inode), sbi), ei->flags);



	dentries_per_clu = sbi->dentries_per_clu;

	dentries_per_clu_bits = ilog2(dentries_per_clu);

	max_dentries = (unsigned int)min_t(u64, MAX_EXFAT_DENTRIES,

					   (u64)sbi->num_clusters << dentries_per_clu_bits);

				(u64)EXFAT_CLU_TO_DEN(sbi->num_clusters, sbi));



	clu_offset = dentry >> dentries_per_clu_bits;

	clu_offset = EXFAT_DEN_TO_CLU(dentry, sbi);

	exfat_chain_dup(&clu, &dir);



	if (clu.flags == ALLOC_NO_FAT_CHAIN) {
@@ -163,7 +162,7 @@ static int exfat_readdir(struct inode *inode, loff_t *cpos, struct exfat_dir_ent 
			dir_entry->entry = dentry;

			brelse(bh);



			ei->hint_bmap.off = dentry >> dentries_per_clu_bits;

			ei->hint_bmap.off = EXFAT_DEN_TO_CLU(dentry, sbi);

			ei->hint_bmap.clu = clu.dir;



			*cpos = EXFAT_DEN_TO_B(dentry + 1 + num_ext);

exfat_fs.h

+8 −2
Original line number Diff line number Diff line
@@ -114,11 +114,17 @@ enum { 
/*

 * helpers for block size to dentry size conversion.

 */

#define EXFAT_B_TO_DEN_IDX(b, sbi)	\

	((b) << ((sbi)->cluster_size_bits - DENTRY_SIZE_BITS))

#define EXFAT_B_TO_DEN(b)		((b) >> DENTRY_SIZE_BITS)

#define EXFAT_DEN_TO_B(b)		((b) << DENTRY_SIZE_BITS)



/*

 * helpers for cluster size to dentry size conversion.

 */

#define EXFAT_CLU_TO_DEN(clu, sbi)	\

	((clu) << ((sbi)->cluster_size_bits - DENTRY_SIZE_BITS))

#define EXFAT_DEN_TO_CLU(dentry, sbi)	\

	((dentry) >> ((sbi)->cluster_size_bits - DENTRY_SIZE_BITS))



/*

 * helpers for fat entry.

 */