From 0452e606c29bf74f22feba892422fc5365a6e00a Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Sat, 21 Oct 2006 10:24:24 -0700
Subject: [PATCH] --- yaml --- r: 40119 b: refs/heads/master c:
 fc22617e451f23b466d4d63bb016f5f6111b69e4 h: refs/heads/master i:   40117:
 12f73a4c295245061a11cbea25f9ac9496c69125   40115:
 e829c5b6a20caca100c106fbb788beac6df996e7   40111:
 51d34319d97ec02838f79e77e132c96762bdcecd v: v3

---
 [refs]             | 2 +-
 trunk/fs/nfs/dir.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 26d719afb588..b2100ae4132e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9eaef27b36a6b716384948da94b8fc5bfba7b712
+refs/heads/master: fc22617e451f23b466d4d63bb016f5f6111b69e4
diff --git a/trunk/fs/nfs/dir.c b/trunk/fs/nfs/dir.c
index 27b5a1051b1c..b34cd16f472f 100644
--- a/trunk/fs/nfs/dir.c
+++ b/trunk/fs/nfs/dir.c
@@ -936,8 +936,14 @@ static struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, stru
 no_entry:
 	res = d_materialise_unique(dentry, inode);
 	if (res != NULL) {
+		struct dentry *parent;
 		if (IS_ERR(res))
 			goto out_unlock;
+		/* Was a directory renamed! */
+		parent = dget_parent(res);
+		if (!IS_ROOT(parent))
+			nfs_mark_for_revalidate(parent->d_inode);
+		dput(parent);
 		dentry = res;
 	}
 	nfs_renew_times(dentry);