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

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

exfat: replace magic numbers with Macros 



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>
Signed-off-by: default avatarNamjae Jeon <linkinjeon@kernel.org>
parent 7cab729c

dir.c

+6 −6
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ static void exfat_get_uniname_from_ext_entry(struct super_block *sb, 
	 * Third entry  : first file-name entry

	 * So, the index of first file-name dentry should start from 2.

	 */

	for (i = 2; i < es.num_entries; i++) {

	for (i = ES_IDX_FIRST_FILENAME; i < es.num_entries; i++) {

		struct exfat_dentry *ep = exfat_get_dentry_cached(&es, i);



		/* end of name entry */
@@ -337,7 +337,7 @@ int exfat_calc_num_entries(struct exfat_uni_name *p_uniname) 
		return -EINVAL;



	/* 1 file entry + 1 stream entry + name entries */

	return ((len - 1) / EXFAT_FILE_NAME_LEN + 3);

	return ES_ENTRY_NUM(len);

}



unsigned int exfat_get_entry_type(struct exfat_dentry *ep)
@@ -602,13 +602,13 @@ void exfat_update_dir_chksum_with_entry_set(struct exfat_entry_set_cache *es) 
	unsigned short chksum = 0;

	struct exfat_dentry *ep;



	for (i = 0; i < es->num_entries; i++) {

	for (i = ES_IDX_FILE; i < es->num_entries; i++) {

		ep = exfat_get_dentry_cached(es, i);

		chksum = exfat_calc_chksum16(ep, DENTRY_SIZE, chksum,

					     chksum_type);

		chksum_type = CS_DEFAULT;

	}

	ep = exfat_get_dentry_cached(es, 0);

	ep = exfat_get_dentry_cached(es, ES_IDX_FILE);

	ep->dentry.file.checksum = cpu_to_le16(chksum);

	es->modified = true;

}
@@ -869,7 +869,7 @@ int exfat_get_dentry_set(struct exfat_entry_set_cache *es, 
		return -EIO;

	es->bh[es->num_bh++] = bh;



	ep = exfat_get_dentry_cached(es, 0);

	ep = exfat_get_dentry_cached(es, ES_IDX_FILE);

	if (!exfat_validate_entry(exfat_get_entry_type(ep), &mode))

		goto put_es;
@@ -906,7 +906,7 @@ int exfat_get_dentry_set(struct exfat_entry_set_cache *es, 
	}



	/* validate cached dentries */

	for (i = 1; i < num_entries; i++) {

	for (i = ES_IDX_STREAM; i < num_entries; i++) {

		ep = exfat_get_dentry_cached(es, i);

		if (!exfat_validate_entry(exfat_get_entry_type(ep), &mode))

			goto put_es;

inode.c

+2 −2
Original line number Diff line number Diff line
@@ -46,8 +46,8 @@ int __exfat_write_inode(struct inode *inode, int sync) 
	/* get the directory entry of given file or directory */

	if (exfat_get_dentry_set(&es, sb, &(ei->dir), ei->entry, ES_ALL_ENTRIES))

		return -EIO;

	ep = exfat_get_dentry_cached(&es, 0);

	ep2 = exfat_get_dentry_cached(&es, 1);

	ep = exfat_get_dentry_cached(&es, ES_IDX_FILE);

	ep2 = exfat_get_dentry_cached(&es, ES_IDX_STREAM);



	ep->dentry.file.attr = cpu_to_le16(exfat_make_attr(inode));

namei.c

+2 −2
Original line number Diff line number Diff line
@@ -704,8 +704,8 @@ static int exfat_find(struct inode *dir, struct qstr *qname, 
	dentry = hint_opt.eidx;

	if (exfat_get_dentry_set(&es, sb, &cdir, dentry, ES_2_ENTRIES))

		return -EIO;

	ep = exfat_get_dentry_cached(&es, 0);

	ep2 = exfat_get_dentry_cached(&es, 1);

	ep = exfat_get_dentry_cached(&es, ES_IDX_FILE);

	ep2 = exfat_get_dentry_cached(&es, ES_IDX_STREAM);



	info->type = exfat_get_entry_type(ep);

	info->attr = le16_to_cpu(ep->dentry.file.attr);