From 857584cd64212979205125e2ccfd91c167a423dd Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ZenIV.linux.org.uk>
Date: Thu, 29 Apr 2010 03:10:43 +0100
Subject: [PATCH] --- yaml --- r: 190380 b: refs/heads/master c:
 d9e80b7de91db05c1c4d2e5ebbfd70b3b3ba0e0f h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index a7c188aae009..499853be6718 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d16b0f2f3edf05f12a9e3960588e0d4854157bb
+refs/heads/master: d9e80b7de91db05c1c4d2e5ebbfd70b3b3ba0e0f
diff --git a/trunk/fs/nfs/dir.c b/trunk/fs/nfs/dir.c
index be46f26c9a56..db3ad849a289 100644
--- a/trunk/fs/nfs/dir.c
+++ b/trunk/fs/nfs/dir.c
@@ -837,6 +837,8 @@ static int nfs_lookup_revalidate(struct dentry * dentry, struct nameidata *nd)
 		/* If we have submounts, don't unhash ! */
 		if (have_submounts(dentry))
 			goto out_valid;
+		if (dentry->d_flags & DCACHE_DISCONNECTED)
+			goto out_valid;
 		shrink_dcache_parent(dentry);
 	}
 	d_drop(dentry);