From 773ead18c8fb142b4c2846ca16fe8ef545204cbf Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Tue, 24 May 2011 13:06:18 -0700
Subject: [PATCH] --- yaml --- r: 251698 b: refs/heads/master c:
 5afcb940fa37f57d124155f30a1a8d7794a476e0 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 3fad42d1d0b5..11d2ac10c62a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a61a245f7489feec865264e2627c5071aef8c66
+refs/heads/master: 5afcb940fa37f57d124155f30a1a8d7794a476e0
diff --git a/trunk/fs/ext2/namei.c b/trunk/fs/ext2/namei.c
index 516c31dab97c..ed5c5d496ee9 100644
--- a/trunk/fs/ext2/namei.c
+++ b/trunk/fs/ext2/namei.c
@@ -296,8 +296,6 @@ static int ext2_rmdir (struct inode * dir, struct dentry *dentry)
 	struct inode * inode = dentry->d_inode;
 	int err = -ENOTEMPTY;
 
-	dentry_unhash(dentry);
-
 	if (ext2_empty_dir(inode)) {
 		err = ext2_unlink(dir, dentry);
 		if (!err) {
@@ -320,9 +318,6 @@ static int ext2_rename (struct inode * old_dir, struct dentry * old_dentry,
 	struct ext2_dir_entry_2 * old_de;
 	int err = -ENOENT;
 
-	if (new_dentry->d_inode && S_ISDIR(new_dentry->d_inode->i_mode))
-		dentry_unhash(new_dentry);
-
 	dquot_initialize(old_dir);
 	dquot_initialize(new_dir);