From 9b63cc39a6b4fb1f0482d793fb500d3890f423fb Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Sat, 31 Jul 2010 14:29:06 -0400
Subject: [PATCH] --- yaml --- r: 206400 b: refs/heads/master c:
 0a8ebba943dd89bdd57c5dab5a66932f690847d9 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 4d314bd5badb..49e227765b6f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b924e5f878e3cd62a20bd8dbf3b911a40185a99
+refs/heads/master: 0a8ebba943dd89bdd57c5dab5a66932f690847d9
diff --git a/trunk/fs/nfs/dir.c b/trunk/fs/nfs/dir.c
index 782b431ef91c..067a051397ba 100644
--- a/trunk/fs/nfs/dir.c
+++ b/trunk/fs/nfs/dir.c
@@ -1652,16 +1652,7 @@ static int nfs_rename(struct inode *old_dir, struct dentry *old_dentry,
 		}
 	}
 
-	/*
-	 * ... prune child dentries and writebacks if needed.
-	 */
-	if (atomic_read(&old_dentry->d_count) > 1) {
-		if (S_ISREG(old_inode->i_mode))
-			nfs_wb_all(old_inode);
-		shrink_dcache_parent(old_dentry);
-	}
 	nfs_inode_return_delegation(old_inode);
-
 	if (new_inode != NULL)
 		nfs_inode_return_delegation(new_inode);