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

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

exfat: rename exfat_free_dentry_set() to exfat_put_dentry_set() 



Since struct exfat_entry_set_cache is allocated from stack,
no need to free, so rename exfat_free_dentry_set() to
exfat_put_dentry_set(). After renaming, the new function pair
is exfat_get_dentry_set()/exfat_put_dentry_set().

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 7771b09c

dir.c

+8 −8
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static void exfat_get_uniname_from_ext_entry(struct super_block *sb, 
		uniname += EXFAT_FILE_NAME_LEN;

	}



	exfat_free_dentry_set(&es, false);

	exfat_put_dentry_set(&es, false);

}



/* read a directory entry from the opened directory */
@@ -613,7 +613,7 @@ void exfat_update_dir_chksum_with_entry_set(struct exfat_entry_set_cache *es) 
	es->modified = true;

}



int exfat_free_dentry_set(struct exfat_entry_set_cache *es, int sync)

int exfat_put_dentry_set(struct exfat_entry_set_cache *es, int sync)

{

	int i, err = 0;
@@ -871,7 +871,7 @@ int exfat_get_dentry_set(struct exfat_entry_set_cache *es, 


	ep = exfat_get_dentry_cached(es, 0);

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

		goto free_es;

		goto put_es;



	num_entries = type == ES_ALL_ENTRIES ?

		ep->dentry.file.num_ext + 1 : type;
@@ -893,7 +893,7 @@ int exfat_get_dentry_set(struct exfat_entry_set_cache *es, 
			if (p_dir->flags == ALLOC_NO_FAT_CHAIN)

				clu++;

			else if (exfat_get_next_cluster(sb, &clu))

				goto free_es;

				goto put_es;

			sec = exfat_cluster_to_sector(sbi, clu);

		} else {

			sec++;
@@ -901,7 +901,7 @@ int exfat_get_dentry_set(struct exfat_entry_set_cache *es, 


		bh = sb_bread(sb, sec);

		if (!bh)

			goto free_es;

			goto put_es;

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

	}
@@ -909,12 +909,12 @@ int exfat_get_dentry_set(struct exfat_entry_set_cache *es, 
	for (i = 1; i < num_entries; i++) {

		ep = exfat_get_dentry_cached(es, i);

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

			goto free_es;

			goto put_es;

	}

	return 0;



free_es:

	exfat_free_dentry_set(es, false);

put_es:

	exfat_put_dentry_set(es, false);

	return -EIO;

}

exfat_fs.h

+1 −1
Original line number Diff line number Diff line
@@ -529,7 +529,7 @@ struct exfat_dentry *exfat_get_dentry_cached(struct exfat_entry_set_cache *es, 
int exfat_get_dentry_set(struct exfat_entry_set_cache *es,

		struct super_block *sb, struct exfat_chain *p_dir, int entry,

		unsigned int type);

int exfat_free_dentry_set(struct exfat_entry_set_cache *es, int sync);

int exfat_put_dentry_set(struct exfat_entry_set_cache *es, int sync);

int exfat_count_dir_entries(struct super_block *sb, struct exfat_chain *p_dir);



/* inode.c */

inode.c

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ int __exfat_write_inode(struct inode *inode, int sync) 
	}



	exfat_update_dir_chksum_with_entry_set(&es);

	return exfat_free_dentry_set(&es, sync);

	return exfat_put_dentry_set(&es, sync);

}



int exfat_write_inode(struct inode *inode, struct writeback_control *wbc)

namei.c

+1 −1
Original line number Diff line number Diff line
@@ -734,7 +734,7 @@ static int exfat_find(struct inode *dir, struct qstr *qname, 
			     ep->dentry.file.access_time,

			     ep->dentry.file.access_date,

			     0);

	exfat_free_dentry_set(&es, false);

	exfat_put_dentry_set(&es, false);



	if (ei->start_clu == EXFAT_FREE_CLUSTER) {

		exfat_fs_error(sb,