---

yaml --- r: 69253 b: refs/heads/master c: 6ecc5e8 h: refs/heads/master i: 69251: c0c61c8 v: v3
git-mirror · Oct 9, 2007 · 17c79c8 · 17c79c8
1 parent 21b08d7
commit 17c79c8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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);
 }