ufs: remove unnecessary dentry_unhash from rmdir, dir rename
ufs does not have problems with references to unlinked directories. CC: Evgeniy Dushistov <dushistov@mail.ru> Signed-off-by: Sage Weil <sage@newdream.net> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
parent
0e54ec1c3a
commit
87161faae2
|
@ -258,8 +258,6 @@ static int ufs_rmdir (struct inode * dir, struct dentry *dentry)
|
||||||
struct inode * inode = dentry->d_inode;
|
struct inode * inode = dentry->d_inode;
|
||||||
int err= -ENOTEMPTY;
|
int err= -ENOTEMPTY;
|
||||||
|
|
||||||
dentry_unhash(dentry);
|
|
||||||
|
|
||||||
lock_ufs(dir->i_sb);
|
lock_ufs(dir->i_sb);
|
||||||
if (ufs_empty_dir (inode)) {
|
if (ufs_empty_dir (inode)) {
|
||||||
err = ufs_unlink(dir, dentry);
|
err = ufs_unlink(dir, dentry);
|
||||||
|
@ -284,9 +282,6 @@ static int ufs_rename(struct inode *old_dir, struct dentry *old_dentry,
|
||||||
struct ufs_dir_entry *old_de;
|
struct ufs_dir_entry *old_de;
|
||||||
int err = -ENOENT;
|
int err = -ENOENT;
|
||||||
|
|
||||||
if (new_inode && S_ISDIR(new_inode->i_mode))
|
|
||||||
dentry_unhash(new_dentry);
|
|
||||||
|
|
||||||
old_de = ufs_find_entry(old_dir, &old_dentry->d_name, &old_page);
|
old_de = ufs_find_entry(old_dir, &old_dentry->d_name, &old_page);
|
||||||
if (!old_de)
|
if (!old_de)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
Loading…
Reference in New Issue