From 7660fbec43a231eba1883a9ecdb3be58bc6f4311 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Tue, 24 May 2011 13:06:15 -0700
Subject: [PATCH] --- yaml --- r: 251695 b: refs/heads/master c:
 f64f58f85403a5a8a21f1fbbc7798e56580785cf h: refs/heads/master i:   251693:
 d40760aed675989e12501cd3c704fa989f9c51b1   251691:
 4fd0b08366f7d4d837034cdb180ebb13efe990ab   251687:
 9ca4fc18a1d2983838e6e32c8e2c7667a78d7099   251679:
 a1a2e639a7812465a462b705550ee81eb0321c68 v: v3

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

diff --git a/[refs] b/[refs]
index e67538135cb0..85795a2888df 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 051e8f0ee23c9ca963e2a0208153c6cd475f05fb
+refs/heads/master: f64f58f85403a5a8a21f1fbbc7798e56580785cf
diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c
index 3a33ae3ace5b..7cd8ab0ef04d 100644
--- a/trunk/fs/btrfs/inode.c
+++ b/trunk/fs/btrfs/inode.c
@@ -3062,8 +3062,6 @@ static int btrfs_rmdir(struct inode *dir, struct dentry *dentry)
 	    inode->i_ino == BTRFS_FIRST_FREE_OBJECTID)
 		return -ENOTEMPTY;
 
-	dentry_unhash(dentry);
-
 	trans = __unlink_start_trans(dir, dentry);
 	if (IS_ERR(trans))
 		return PTR_ERR(trans);
@@ -6994,9 +6992,6 @@ static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry,
 	u64 root_objectid;
 	int ret;
 
-	if (new_inode && S_ISDIR(new_dentry->d_inode->i_mode))
-		dentry_unhash(new_dentry);
-
 	if (new_dir->i_ino == BTRFS_EMPTY_SUBVOL_DIR_OBJECTID)
 		return -EPERM;