From 7002894dc7a5c70fe6e059693facd040fb53a941 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Tue, 2 Oct 2007 12:54:39 -0400
Subject: [PATCH] --- yaml --- r: 69279 b: refs/heads/master c:
 f2c77f4e62a2290ae46b5b0449eb72d72afe691e h: refs/heads/master i:   69277:
 bc415d53e73482edc6da9b34fa68fa217209acc8   69275:
 67ad148c6ad930f2842f14e266de215bb8b70db2   69271:
 2e965ea98a8cf5fd30d22852be7328fce578ced5   69263:
 fb495c9982209b6892b2ed03726a19f4fa05ffde   69247:
 3b9923c641ce03fb8e42bb66b018747851a42666 v: v3

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

diff --git a/[refs] b/[refs]
index d3df7d24ae60..4f65e0a4014d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d2b2966869142660f46d1e06cf9d15c3debcf77
+refs/heads/master: f2c77f4e62a2290ae46b5b0449eb72d72afe691e
diff --git a/trunk/fs/nfs/dir.c b/trunk/fs/nfs/dir.c
index 34da48586829..cf80cf234e27 100644
--- a/trunk/fs/nfs/dir.c
+++ b/trunk/fs/nfs/dir.c
@@ -646,9 +646,14 @@ static int nfs_check_verifier(struct inode *dir, struct dentry *dentry)
 {
 	if (IS_ROOT(dentry))
 		return 1;
-	if (nfs_verify_change_attribute(dir, dentry->d_time))
-		return 1;
-	return 0;
+	if (!nfs_verify_change_attribute(dir, dentry->d_time))
+		return 0;
+	/* Revalidate nfsi->cache_change_attribute before we declare a match */
+	if (nfs_revalidate_inode(NFS_SERVER(dir), dir) < 0)
+		return 0;
+	if (!nfs_verify_change_attribute(dir, dentry->d_time))
+		return 0;
+	return 1;
 }
 
 static inline void nfs_set_verifier(struct dentry * dentry, unsigned long verf)
@@ -742,10 +747,6 @@ static int nfs_lookup_revalidate(struct dentry * dentry, struct nameidata *nd)
 	nfs_inc_stats(dir, NFSIOS_DENTRYREVALIDATE);
 	inode = dentry->d_inode;
 
-	/* Revalidate parent directory attribute cache */
-	if (nfs_revalidate_inode(NFS_SERVER(dir), dir) < 0)
-		goto out_zap_parent;
-
 	if (!inode) {
 		if (nfs_neg_need_reval(dir, dentry, nd))
 			goto out_bad;