From 7cd37b84f881649977466be0c1cf373a2642f97c Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Tue, 24 May 2011 13:06:17 -0700
Subject: [PATCH] --- yaml --- r: 251697 b: refs/heads/master c:
 5a61a245f7489feec865264e2627c5071aef8c66 h: refs/heads/master i:   251695:
 7660fbec43a231eba1883a9ecdb3be58bc6f4311 v: v3

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

diff --git a/[refs] b/[refs]
index 4d9af0edcaf9..3fad42d1d0b5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40ebc0af58a88652c9a9c1e9126c8fcf9fce1f6e
+refs/heads/master: 5a61a245f7489feec865264e2627c5071aef8c66
diff --git a/trunk/fs/ext3/namei.c b/trunk/fs/ext3/namei.c
index f89b1d4c2fb5..32f3b8695859 100644
--- a/trunk/fs/ext3/namei.c
+++ b/trunk/fs/ext3/namei.c
@@ -2074,8 +2074,6 @@ static int ext3_rmdir (struct inode * dir, struct dentry *dentry)
 	struct ext3_dir_entry_2 * de;
 	handle_t *handle;
 
-	dentry_unhash(dentry);
-
 	/* Initialize quotas before so that eventual writes go in
 	 * separate transaction */
 	dquot_initialize(dir);
@@ -2298,9 +2296,6 @@ static int ext3_rename (struct inode * old_dir, struct dentry *old_dentry,
 	struct ext3_dir_entry_2 * old_de, * new_de;
 	int retval, flush_file = 0;
 
-	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);