mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-24 20:54:10 +08:00
hfs: remove unnecessary dentry_unhash on rmdir, dir rename
hfs 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:
parent
8aaa0f5431
commit
4e82d61b6a
@ -253,9 +253,6 @@ static int hfs_remove(struct inode *dir, struct dentry *dentry)
|
||||
struct inode *inode = dentry->d_inode;
|
||||
int res;
|
||||
|
||||
if (S_ISDIR(inode->i_mode))
|
||||
dentry_unhash(dentry);
|
||||
|
||||
if (S_ISDIR(inode->i_mode) && inode->i_size != 2)
|
||||
return -ENOTEMPTY;
|
||||
res = hfs_cat_delete(inode->i_ino, dir, &dentry->d_name);
|
||||
@ -286,9 +283,6 @@ static int hfs_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);
|
||||
|
||||
res = hfs_remove(new_dir, new_dentry);
|
||||
if (res)
|
||||
return res;
|
||||
|
Loading…
Reference in New Issue
Block a user