From: Sage Weil <sage@newdream.net>
Date: Tue, 24 May 2011 20:06:09 +0000 (-0700)
Subject: libfs: drop unneeded dentry_unhash
X-Git-Tag: MMI-PSA29.97-13-9~19455^2~13
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5c5d3f3b871a719e2c6413b85009c723adeb27e1;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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>
---

diff --git a/fs/libfs.c b/fs/libfs.c
index 91a3710e0fe5..c88eab55aec9 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;