From 54b17e2a8d9a2a8bd95a16fb0e6adffc5bbe67c9 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Tue, 24 May 2011 13:06:09 -0700
Subject: [PATCH] --- yaml --- r: 251689 b: refs/heads/master c:
 5c5d3f3b871a719e2c6413b85009c723adeb27e1 h: refs/heads/master i:   251687:
 9ca4fc18a1d2983838e6e32c8e2c7667a78d7099 v: v3

---
 [refs]           | 2 +-
 trunk/fs/libfs.c | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 67049c234184..4138aaf940c3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a71905f0db41d4b2b01044fb40f97656fefc44a7
+refs/heads/master: 5c5d3f3b871a719e2c6413b85009c723adeb27e1
diff --git a/trunk/fs/libfs.c b/trunk/fs/libfs.c
index 91a3710e0fe5..c88eab55aec9 100644
--- a/trunk/fs/libfs.c
+++ b/trunk/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;