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

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

diff --git a/[refs] b/[refs]
index 11d2ac10c62a..82c29f777d7d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5afcb940fa37f57d124155f30a1a8d7794a476e0
+refs/heads/master: 052e2a1ba2d07e724ae9cc0608389292276cb77a
diff --git a/trunk/fs/nfs/dir.c b/trunk/fs/nfs/dir.c
index 87daf7982186..7237672216c8 100644
--- a/trunk/fs/nfs/dir.c
+++ b/trunk/fs/nfs/dir.c
@@ -1748,8 +1748,6 @@ static int nfs_rmdir(struct inode *dir, struct dentry *dentry)
 	dfprintk(VFS, "NFS: rmdir(%s/%ld), %s\n",
 			dir->i_sb->s_id, dir->i_ino, dentry->d_name.name);
 
-	dentry_unhash(dentry);
-
 	error = NFS_PROTO(dir)->rmdir(dir, &dentry->d_name);
 	/* Ensure the VFS deletes this inode */
 	if (error == 0 && dentry->d_inode != NULL)
@@ -1959,9 +1957,6 @@ static int nfs_rename(struct inode *old_dir, struct dentry *old_dentry,
 		 new_dentry->d_parent->d_name.name, new_dentry->d_name.name,
 		 new_dentry->d_count);
 
-	if (new_inode && S_ISDIR(new_inode->i_mode))
-		dentry_unhash(new_dentry);
-
 	/*
 	 * For non-directories, check whether the target is busy and if so,
 	 * make a copy of the dentry and then do a silly-rename. If the