From 8466e30cb380af0c73150b48e77e7a038dd88aa1 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Mon, 1 Oct 2007 20:10:12 -0400
Subject: [PATCH] --- yaml --- r: 69281 b: refs/heads/master c:
 216d5d06883edfaf992ada0d72a2a22fdfdbd296 h: refs/heads/master i:   69279:
 7002894dc7a5c70fe6e059693facd040fb53a941 v: v3

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

diff --git a/[refs] b/[refs]
index f4d8c8347636..3cbceda61aa0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a5ebc148879be68acdb12fbe72b65cb88c410d9
+refs/heads/master: 216d5d06883edfaf992ada0d72a2a22fdfdbd296
diff --git a/trunk/fs/nfs/dir.c b/trunk/fs/nfs/dir.c
index 9ca38ab0e0a7..41b063c98822 100644
--- a/trunk/fs/nfs/dir.c
+++ b/trunk/fs/nfs/dir.c
@@ -1037,8 +1037,12 @@ static int nfs_open_revalidate(struct dentry *dentry, struct nameidata *nd)
 	/* We can't create new files in nfs_open_revalidate(), so we
 	 * optimize away revalidation of negative dentries.
 	 */
-	if (inode == NULL)
+	if (inode == NULL) {
+		if (!nfs_neg_need_reval(dir, dentry, nd))
+			ret = 1;
 		goto out;
+	}
+
 	/* NFS only supports OPEN on regular files */
 	if (!S_ISREG(inode->i_mode))
 		goto no_open;