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

Commit 29a1aca7 authored by Tetsuhiro Kohada's avatar Tetsuhiro Kohada Committed by lixiang
Browse files

exfat: eliminate dead code in exfat_find() 



The exfat_find_dir_entry() called by exfat_find() doesn't return -EEXIST.
Therefore, the root-dir information setting is never executed.

Signed-off-by: default avatarTetsuhiro Kohada <kohada.t2@gmail.com>
Acked-by: default avatarSungjong Seo <sj1557.seo@samsung.com>
Signed-off-by: default avatarNamjae Jeon <namjae.jeon@samsung.com>
Git-commit: 188df41f212c9282f6cb05b832383ffca3c66893
Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git


Signed-off-by: default avatarlixiang <lixiang@codeaurora.org>
parent 2d856690

fs/exfat/dir.c

+0 −1
Original line number Diff line number Diff line
@@ -911,7 +911,6 @@ enum { 
/*

 * return values:

 *   >= 0	: return dir entiry position with the name in dir

 *   -EEXIST	: (root dir, ".") it is the root dir itself

 *   -ENOENT	: entry with the name does not exist

 *   -EIO	: I/O error

 */

fs/exfat/namei.c

+47 −73
Original line number Diff line number Diff line
@@ -604,6 +604,8 @@ static int exfat_find(struct inode *dir, struct qstr *qname, 
	struct super_block *sb = dir->i_sb;

	struct exfat_sb_info *sbi = EXFAT_SB(sb);

	struct exfat_inode_info *ei = EXFAT_I(dir);

	struct exfat_dentry *ep, *ep2;

	struct exfat_entry_set_cache *es;



	if (qname->len == 0)

		return -ENOENT;
@@ -629,39 +631,13 @@ static int exfat_find(struct inode *dir, struct qstr *qname, 
	dentry = exfat_find_dir_entry(sb, ei, &cdir, &uni_name,

			num_entries, TYPE_ALL);



	if ((dentry < 0) && (dentry != -EEXIST))

	if (dentry < 0)

		return dentry; /* -error value */



	memcpy(&info->dir, &cdir.dir, sizeof(struct exfat_chain));

	info->entry = dentry;

	info->num_subdirs = 0;



	/* root directory itself */

	if (unlikely(dentry == -EEXIST)) {

		int num_clu = 0;



		info->type = TYPE_DIR;

		info->attr = ATTR_SUBDIR;

		info->flags = ALLOC_FAT_CHAIN;

		info->start_clu = sbi->root_dir;

		memset(&info->crtime, 0, sizeof(info->crtime));

		memset(&info->mtime, 0, sizeof(info->mtime));

		memset(&info->atime, 0, sizeof(info->atime));



		exfat_chain_set(&cdir, sbi->root_dir, 0, ALLOC_FAT_CHAIN);

		if (exfat_count_num_clusters(sb, &cdir, &num_clu))

			return -EIO;

		info->size = num_clu << sbi->cluster_size_bits;



		count = exfat_count_dir_entries(sb, &cdir);

		if (count < 0)

			return -EIO;



		info->num_subdirs = count;

	} else {

		struct exfat_dentry *ep, *ep2;

		struct exfat_entry_set_cache *es;



	es = exfat_get_dentry_set(sb, &cdir, dentry, ES_2_ENTRIES);

	if (!es)

		return -EIO;
@@ -680,14 +656,6 @@ static int exfat_find(struct inode *dir, struct qstr *qname, 
			le32_to_cpu(ep2->dentry.stream.start_clu);

	}



		if (ei->start_clu == EXFAT_FREE_CLUSTER) {

			exfat_fs_error(sb,

				"non-zero size file starts with zero cluster (size : %llu, p_dir : %u, entry : 0x%08x)",

				i_size_read(dir), ei->dir.dir, ei->entry);

			exfat_free_dentry_set(es, false);

			return -EIO;

		}



	exfat_get_entry_time(sbi, &info->crtime,

			     ep->dentry.file.create_tz,

			     ep->dentry.file.create_time,
@@ -705,6 +673,13 @@ static int exfat_find(struct inode *dir, struct qstr *qname, 
			     0);

	exfat_free_dentry_set(es, false);



	if (ei->start_clu == EXFAT_FREE_CLUSTER) {

		exfat_fs_error(sb,

			       "non-zero size file starts with zero cluster (size : %llu, p_dir : %u, entry : 0x%08x)",

			       i_size_read(dir), ei->dir.dir, ei->entry);

		return -EIO;

	}



	if (info->type == TYPE_DIR) {

		exfat_chain_set(&cdir, info->start_clu,

				EXFAT_B_TO_CLU(info->size, sbi), info->flags);
@@ -714,7 +689,6 @@ static int exfat_find(struct inode *dir, struct qstr *qname, 


		info->num_subdirs = count + EXFAT_MIN_SUBDIR;

	}

	}

	return 0;

}