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:
Родитель
4e82d61b6a
Коммит
e3911785b8
|
@ -370,8 +370,6 @@ static int hfsplus_rmdir(struct inode *dir, struct dentry *dentry)
|
|||
struct inode *inode = dentry->d_inode;
|
||||
int res;
|
||||
|
||||
dentry_unhash(dentry);
|
||||
|
||||
if (inode->i_size != 2)
|
||||
return -ENOTEMPTY;
|
||||
|
||||
|
@ -469,12 +467,10 @@ static int hfsplus_rename(struct inode *old_dir, struct dentry *old_dentry,
|
|||
|
||||
/* Unlink destination if it already exists */
|
||||
if (new_dentry->d_inode) {
|
||||
if (S_ISDIR(new_dentry->d_inode->i_mode)) {
|
||||
dentry_unhash(new_dentry);
|
||||
if (S_ISDIR(new_dentry->d_inode->i_mode))
|
||||
res = hfsplus_rmdir(new_dir, new_dentry);
|
||||
} else {
|
||||
else
|
||||
res = hfsplus_unlink(new_dir, new_dentry);
|
||||
}
|
||||
if (res)
|
||||
return res;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче