openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

hfsplus: remove unnecessary dentry_unhash on rmdir, dir rename 

hfsplus does not have problems with references to unlinked directories.

Signed-off-by: Sage Weil <sage@newdream.net>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Sage Weil 2011-05-27 13:42:06 -07:00 committed by Al Viro
parent 4e82d61b6a
commit e3911785b8
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fs/hfsplus/dir.c
View File

@ -370,8 +370,6 @@ static int hfsplus_rmdir(struct inode *dir, struct dentry *dentry)
struct inode *inode = dentry->d_inode; struct inode *inode = dentry->d_inode;
int res; int res;
dentry_unhash(dentry);
if (inode->i_size != 2) if (inode->i_size != 2)
return -ENOTEMPTY; return -ENOTEMPTY;
@ -469,12 +467,10 @@ static int hfsplus_rename(struct inode *old_dir, struct dentry *old_dentry,
/* Unlink destination if it already exists */ /* Unlink destination if it already exists */
if (new_dentry->d_inode) { if (new_dentry->d_inode) {
if (S_ISDIR(new_dentry->d_inode->i_mode)) { if (S_ISDIR(new_dentry->d_inode->i_mode))
dentry_unhash(new_dentry);
res = hfsplus_rmdir(new_dir, new_dentry); res = hfsplus_rmdir(new_dir, new_dentry);
} else { else
res = hfsplus_unlink(new_dir, new_dentry); res = hfsplus_unlink(new_dir, new_dentry);
}
if (res) if (res)
return res; return res;
} }