Skip to content

Commit 30ef0e0

Browse files
YuezhangMonamjaejeon
authored andcommitted
exfat: remove unnecessary read entry in __exfat_rename()
To determine whether it is a directory, there is no need to read its directory entry, just use S_ISDIR(inode->i_mode). Signed-off-by: Yuezhang Mo <[email protected]> Reviewed-by: Aoyama Wataru <[email protected]> Reviewed-by: Daniel Palmer <[email protected]> Reviewed-by: Sungjong Seo <[email protected]> Signed-off-by: Namjae Jeon <[email protected]>
1 parent 2e94e5b commit 30ef0e0

File tree

1 file changed

+4
-16
lines changed

1 file changed

+4
-16
lines changed

fs/exfat/namei.c

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1131,17 +1131,12 @@ static int __exfat_rename(struct inode *old_parent_inode,
11311131
int ret;
11321132
int dentry;
11331133
struct exfat_chain olddir, newdir;
1134-
struct exfat_chain *p_dir = NULL;
11351134
struct exfat_uni_name uni_name;
1136-
struct exfat_dentry *ep;
11371135
struct super_block *sb = old_parent_inode->i_sb;
11381136
struct exfat_sb_info *sbi = EXFAT_SB(sb);
11391137
const unsigned char *new_path = new_dentry->d_name.name;
11401138
struct inode *new_inode = new_dentry->d_inode;
11411139
struct exfat_inode_info *new_ei = NULL;
1142-
unsigned int new_entry_type = TYPE_UNUSED;
1143-
int new_entry = 0;
1144-
struct buffer_head *new_bh = NULL;
11451140

11461141
/* check the validity of pointer parameters */
11471142
if (new_path == NULL || strlen(new_path) == 0)
@@ -1167,17 +1162,8 @@ static int __exfat_rename(struct inode *old_parent_inode,
11671162
goto out;
11681163
}
11691164

1170-
p_dir = &(new_ei->dir);
1171-
new_entry = new_ei->entry;
1172-
ep = exfat_get_dentry(sb, p_dir, new_entry, &new_bh);
1173-
if (!ep)
1174-
goto out;
1175-
1176-
new_entry_type = exfat_get_entry_type(ep);
1177-
brelse(new_bh);
1178-
11791165
/* if new_inode exists, update ei */
1180-
if (new_entry_type == TYPE_DIR) {
1166+
if (S_ISDIR(new_inode->i_mode)) {
11811167
struct exfat_chain new_clu;
11821168

11831169
new_clu.dir = new_ei->start_clu;
@@ -1209,6 +1195,8 @@ static int __exfat_rename(struct inode *old_parent_inode,
12091195

12101196
if (!ret && new_inode) {
12111197
struct exfat_entry_set_cache es;
1198+
struct exfat_chain *p_dir = &(new_ei->dir);
1199+
int new_entry = new_ei->entry;
12121200

12131201
/* delete entries of new_dir */
12141202
ret = exfat_get_dentry_set(&es, sb, p_dir, new_entry,
@@ -1225,7 +1213,7 @@ static int __exfat_rename(struct inode *old_parent_inode,
12251213
goto del_out;
12261214

12271215
/* Free the clusters if new_inode is a dir(as if exfat_rmdir) */
1228-
if (new_entry_type == TYPE_DIR &&
1216+
if (S_ISDIR(new_inode->i_mode) &&
12291217
new_ei->start_clu != EXFAT_EOF_CLUSTER) {
12301218
/* new_ei, new_clu_to_free */
12311219
struct exfat_chain new_clu_to_free;

0 commit comments

Comments
 (0)