summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2011-05-24 13:06:09 -0700
committerAl Viro <viro@zeniv.linux.org.uk>2011-05-26 07:26:50 -0400
commit5c5d3f3b871a719e2c6413b85009c723adeb27e1 (patch)
tree8047b35ed1d8d385b25f906d4d05a83b062ebcb1
parenta71905f0db41d4b2b01044fb40f97656fefc44a7 (diff)
downloadlinux-3.10-5c5d3f3b871a719e2c6413b85009c723adeb27e1.tar.gz
linux-3.10-5c5d3f3b871a719e2c6413b85009c723adeb27e1.tar.bz2
linux-3.10-5c5d3f3b871a719e2c6413b85009c723adeb27e1.zip
libfs: drop unneeded dentry_unhash
There are no libfs issues with dangling references to empty directories. Signed-off-by: Sage Weil <sage@newdream.net> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/libfs.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/libfs.c b/fs/libfs.c
index 91a3710e0fe..c88eab55aec 100644
--- a/fs/libfs.c
+++ b/fs/libfs.c
@@ -311,8 +311,6 @@ int simple_rmdir(struct inode *dir, struct dentry *dentry)
if (!simple_empty(dentry))
return -ENOTEMPTY;
- dentry_unhash(dentry);
-
drop_nlink(dentry->d_inode);
simple_unlink(dir, dentry);
drop_nlink(dir);
@@ -325,9 +323,6 @@ int simple_rename(struct inode *old_dir, struct dentry *old_dentry,
struct inode *inode = old_dentry->d_inode;
int they_are_dirs = S_ISDIR(old_dentry->d_inode->i_mode);
- if (new_dentry->d_inode && S_ISDIR(new_dentry->d_inode->i_mode))
- dentry_unhash(new_dentry);
-
if (!simple_empty(new_dentry))
return -ENOTEMPTY;