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

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

exfat: remove unnecessary arguments from exfat_find_dir_entry() 



This commit removes argument 'num_entries' and 'type' from
exfat_find_dir_entry().

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 9ba14ac9

dir.c

+7 −5
Original line number Diff line number Diff line
@@ -967,7 +967,7 @@ enum { 
 */

int exfat_find_dir_entry(struct super_block *sb, struct exfat_inode_info *ei,

		struct exfat_chain *p_dir, struct exfat_uni_name *p_uniname,

		int num_entries, unsigned int type, struct exfat_hint *hint_opt)

		struct exfat_hint *hint_opt)

{

	int i, rewind = 0, dentry = 0, end_eidx = 0, num_ext = 0, len;

	int order, step, name_len = 0;
@@ -978,6 +978,10 @@ int exfat_find_dir_entry(struct super_block *sb, struct exfat_inode_info *ei, 
	struct exfat_hint *hint_stat = &ei->hint_stat;

	struct exfat_hint_femp candi_empty;

	struct exfat_sb_info *sbi = EXFAT_SB(sb);

	int num_entries = exfat_calc_num_entries(p_uniname);



	if (num_entries < 0)

		return num_entries;



	dentries_per_clu = sbi->dentries_per_clu;
@@ -1031,10 +1035,8 @@ int exfat_find_dir_entry(struct super_block *sb, struct exfat_inode_info *ei, 
				step = DIRENT_STEP_FILE;

				hint_opt->clu = clu.dir;

				hint_opt->eidx = i;

				if (type == TYPE_ALL || type == entry_type) {

				num_ext = ep->dentry.file.num_ext;

				step = DIRENT_STEP_STRM;

				}

				brelse(bh);

				continue;

			}

exfat_fs.h

+1 −2
Original line number Diff line number Diff line
@@ -84,7 +84,6 @@ enum { 
#define TYPE_PADDING		0x0402

#define TYPE_ACLTAB		0x0403

#define TYPE_BENIGN_SEC		0x0800

#define TYPE_ALL		0x0FFF



#define MAX_CHARSET_SIZE	6 /* max size of multi-byte character */

#define MAX_NAME_LENGTH		255 /* max len of file name excluding NULL */
@@ -526,7 +525,7 @@ void exfat_update_dir_chksum_with_entry_set(struct exfat_entry_set_cache *es); 
int exfat_calc_num_entries(struct exfat_uni_name *p_uniname);

int exfat_find_dir_entry(struct super_block *sb, struct exfat_inode_info *ei,

		struct exfat_chain *p_dir, struct exfat_uni_name *p_uniname,

		int num_entries, unsigned int type, struct exfat_hint *hint_opt);

		struct exfat_hint *hint_opt);

int exfat_alloc_new_dir(struct inode *inode, struct exfat_chain *clu);

struct exfat_dentry *exfat_get_dentry(struct super_block *sb,

		struct exfat_chain *p_dir, int entry, struct buffer_head **bh);

namei.c

+2 −8
Original line number Diff line number Diff line
@@ -647,7 +647,7 @@ static int exfat_create(struct inode *dir, struct dentry *dentry, umode_t mode, 
static int exfat_find(struct inode *dir, struct qstr *qname,

		struct exfat_dir_entry *info)

{

	int ret, dentry, num_entries, count;

	int ret, dentry, count;

	struct exfat_chain cdir;

	struct exfat_uni_name uni_name;

	struct super_block *sb = dir->i_sb;
@@ -666,10 +666,6 @@ static int exfat_find(struct inode *dir, struct qstr *qname, 
	if (ret)

		return ret;



	num_entries = exfat_calc_num_entries(&uni_name);

	if (num_entries < 0)

		return num_entries;



	/* check the validation of hint_stat and initialize it if required */

#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 16, 0)

	if (ei->version != (inode_peek_iversion_raw(dir) & 0xffffffff)) {
@@ -687,9 +683,7 @@ static int exfat_find(struct inode *dir, struct qstr *qname, 
	}



	/* search the file name for directories */

	dentry = exfat_find_dir_entry(sb, ei, &cdir, &uni_name,

			num_entries, TYPE_ALL, &hint_opt);



	dentry = exfat_find_dir_entry(sb, ei, &cdir, &uni_name, &hint_opt);

	if (dentry < 0)

		return dentry; /* -error value */