UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Tetsuhiro Kohada <kohada.t2@gmail.com>
Acked-by: Sungjong Seo <sj1557.seo@samsung.com>
Signed-off-by: Namjae Jeon <namjae.jeon@samsung.com>
This commit is contained in:
Tetsuhiro Kohada 2020-09-02 16:53:06 +09:00 committed by Namjae Jeon
parent 45882a6a0d
commit 188df41f21
2 changed files with 46 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fs/exfat/dir.c
View File

@ -911,7 +911,6 @@ enum {
/* /*
* return values: * return values:
* >= 0 : return dir entiry position with the name in dir * >= 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 * -ENOENT : entry with the name does not exist
* -EIO : I/O error * -EIO : I/O error
*/ */

118
fs/exfat/namei.c
View File

@ -604,6 +604,8 @@ static int exfat_find(struct inode *dir, struct qstr *qname,
struct super_block *sb = dir->i_sb; struct super_block *sb = dir->i_sb;
struct exfat_sb_info *sbi = EXFAT_SB(sb); struct exfat_sb_info *sbi = EXFAT_SB(sb);
struct exfat_inode_info *ei = EXFAT_I(dir); struct exfat_inode_info *ei = EXFAT_I(dir);
struct exfat_dentry *ep, *ep2;
struct exfat_entry_set_cache *es;
if (qname->len == 0) if (qname->len == 0)
return -ENOENT; return -ENOENT;
@ -629,91 +631,63 @@ static int exfat_find(struct inode *dir, struct qstr *qname,
dentry = exfat_find_dir_entry(sb, ei, &cdir, &uni_name, dentry = exfat_find_dir_entry(sb, ei, &cdir, &uni_name,
num_entries, TYPE_ALL); num_entries, TYPE_ALL);
if ((dentry < 0) && (dentry != -EEXIST)) if (dentry < 0)
return dentry; /* -error value */ return dentry; /* -error value */
memcpy(&info->dir, &cdir.dir, sizeof(struct exfat_chain)); memcpy(&info->dir, &cdir.dir, sizeof(struct exfat_chain));
info->entry = dentry; info->entry = dentry;
info->num_subdirs = 0; info->num_subdirs = 0;
/* root directory itself */ es = exfat_get_dentry_set(sb, &cdir, dentry, ES_2_ENTRIES);
if (unlikely(dentry == -EEXIST)) { if (!es)
int num_clu = 0; return -EIO;
ep = exfat_get_dentry_cached(es, 0);
ep2 = exfat_get_dentry_cached(es, 1);
info->type = TYPE_DIR; info->type = exfat_get_entry_type(ep);
info->attr = ATTR_SUBDIR; info->attr = le16_to_cpu(ep->dentry.file.attr);
info->flags = ALLOC_FAT_CHAIN; info->size = le64_to_cpu(ep2->dentry.stream.valid_size);
info->start_clu = sbi->root_dir; if ((info->type == TYPE_FILE) && (info->size == 0)) {
memset(&info->crtime, 0, sizeof(info->crtime)); info->flags = ALLOC_NO_FAT_CHAIN;
memset(&info->mtime, 0, sizeof(info->mtime)); info->start_clu = EXFAT_EOF_CLUSTER;
memset(&info->atime, 0, sizeof(info->atime)); } else {
info->flags = ep2->dentry.stream.flags;
info->start_clu =
le32_to_cpu(ep2->dentry.stream.start_clu);
}
exfat_chain_set(&cdir, sbi->root_dir, 0, ALLOC_FAT_CHAIN); exfat_get_entry_time(sbi, &info->crtime,
if (exfat_count_num_clusters(sb, &cdir, &num_clu)) ep->dentry.file.create_tz,
return -EIO; ep->dentry.file.create_time,
info->size = num_clu << sbi->cluster_size_bits; ep->dentry.file.create_date,
ep->dentry.file.create_time_cs);
exfat_get_entry_time(sbi, &info->mtime,
ep->dentry.file.modify_tz,
ep->dentry.file.modify_time,
ep->dentry.file.modify_date,
ep->dentry.file.modify_time_cs);
exfat_get_entry_time(sbi, &info->atime,
ep->dentry.file.access_tz,
ep->dentry.file.access_time,
ep->dentry.file.access_date,
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);
count = exfat_count_dir_entries(sb, &cdir); count = exfat_count_dir_entries(sb, &cdir);
if (count < 0) if (count < 0)
return -EIO; return -EIO;
info->num_subdirs = count; info->num_subdirs = count + EXFAT_MIN_SUBDIR;
} 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;
ep = exfat_get_dentry_cached(es, 0);
ep2 = exfat_get_dentry_cached(es, 1);
info->type = exfat_get_entry_type(ep);
info->attr = le16_to_cpu(ep->dentry.file.attr);
info->size = le64_to_cpu(ep2->dentry.stream.valid_size);
if ((info->type == TYPE_FILE) && (info->size == 0)) {
info->flags = ALLOC_NO_FAT_CHAIN;
info->start_clu = EXFAT_EOF_CLUSTER;
} else {
info->flags = ep2->dentry.stream.flags;
info->start_clu =
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,
ep->dentry.file.create_date,
ep->dentry.file.create_time_cs);
exfat_get_entry_time(sbi, &info->mtime,
ep->dentry.file.modify_tz,
ep->dentry.file.modify_time,
ep->dentry.file.modify_date,
ep->dentry.file.modify_time_cs);
exfat_get_entry_time(sbi, &info->atime,
ep->dentry.file.access_tz,
ep->dentry.file.access_time,
ep->dentry.file.access_date,
0);
exfat_free_dentry_set(es, false);
if (info->type == TYPE_DIR) {
exfat_chain_set(&cdir, info->start_clu,
EXFAT_B_TO_CLU(info->size, sbi), info->flags);
count = exfat_count_dir_entries(sb, &cdir);
if (count < 0)
return -EIO;
info->num_subdirs = count + EXFAT_MIN_SUBDIR;
}
} }
return 0; return 0;
} }