From 17c79c83a3a34949db2aed14def3f97632c523e9 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Fri, 28 Sep 2007 14:20:33 -0400
Subject: [PATCH] --- yaml --- r: 69253 b: refs/heads/master c:
 6ecc5e8fcad7ad64d68c098249359831331bd299 h: refs/heads/master i:   69251:
 c0c61c86317b5c9fcafdb1a2fc7d9756f2fefc02 v: v3

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

diff --git a/[refs] b/[refs]
index 1efae99f517b..4c6c84d04583 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7957c1418f4b6c66e28d4ac3c4d7a8c19d526c48
+refs/heads/master: 6ecc5e8fcad7ad64d68c098249359831331bd299
diff --git a/trunk/fs/nfs/dir.c b/trunk/fs/nfs/dir.c
index 2b5e611352c5..6518b098e625 100644
--- a/trunk/fs/nfs/dir.c
+++ b/trunk/fs/nfs/dir.c
@@ -650,15 +650,11 @@ static int nfs_fsync_dir(struct file *filp, struct dentry *dentry, int datasync)
  */
 static int nfs_check_verifier(struct inode *dir, struct dentry *dentry)
 {
-	unsigned long verf;
-
 	if (IS_ROOT(dentry))
 		return 1;
-	verf = dentry->d_time;
-	if (nfs_caches_unstable(dir)
-			|| verf != NFS_I(dir)->cache_change_attribute)
-		return 0;
-	return 1;
+	if (dentry->d_time == NFS_I(dir)->cache_change_attribute)
+		return 1;
+	return 0;
 }
 
 static inline void nfs_set_verifier(struct dentry * dentry, unsigned long verf)
diff --git a/trunk/fs/nfs/inode.c b/trunk/fs/nfs/inode.c
index ed035a81eea2..cca1ab2922bf 100644
--- a/trunk/fs/nfs/inode.c
+++ b/trunk/fs/nfs/inode.c
@@ -785,7 +785,6 @@ void nfs_end_data_update(struct inode *inode)
 		nfsi->cache_validity |= NFS_INO_INVALID_DATA;
 		spin_unlock(&inode->i_lock);
 	}
-	nfsi->cache_change_attribute = jiffies;
 	atomic_dec(&nfsi->data_updates);
 }