summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSage Weil2011-05-27 22:42:01 +0200
committerAl Viro2011-05-28 07:02:51 +0200
commit87161faae26503a8ebe1be5ba72073ae860dbfc7 (patch)
tree3e51892e8bff5699d61459dda3fce6643495101c
parentubifs: remove unnecessary dentry_unhash from rmdir, dir rename (diff)
downloadkernel-qcow2-linux-87161faae26503a8ebe1be5ba72073ae860dbfc7.tar.gz
kernel-qcow2-linux-87161faae26503a8ebe1be5ba72073ae860dbfc7.tar.xz
kernel-qcow2-linux-87161faae26503a8ebe1be5ba72073ae860dbfc7.zip
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>
-rw-r--r--fs/ufs/namei.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/ufs/namei.c b/fs/ufs/namei.c
index 953ebdfc5bf7..29309e25417f 100644
--- a/fs/ufs/namei.c
+++ b/fs/ufs/namei.c
@@ -258,8 +258,6 @@ static int ufs_rmdir (struct inode * dir, struct dentry *dentry)
struct inode * inode = dentry->d_inode;
int err= -ENOTEMPTY;
- dentry_unhash(dentry);
-
lock_ufs(dir->i_sb);
if (ufs_empty_dir (inode)) {
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;
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);
if (!old_de)
goto out;