---

yaml --- r: 115383 b: refs/heads/master c: 076f1fc h: refs/heads/master i: 115381: bfd3b34 115379: 000bc2e 115375: 02e9cf8 v: v3
git-mirror · Oct 7, 2008 · 458bf65 · 458bf65
1 parent 35b6f03
commit 458bf65
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4dc05efb86239321d43a9d74fd2ecd5c21bfc2ad
+refs/heads/master: 076f1fc94c44be2664172c63b4a2b51ae2d265ea
diff --git a/trunk/fs/nfs/inode.c b/trunk/fs/nfs/inode.c
@@ -905,9 +905,6 @@ static int nfs_check_inode_attributes(struct inode *inode, struct nfs_fattr *fat
 		return -EIO;
 	}
 
-	/* Do atomic weak cache consistency updates */
-	nfs_wcc_update_inode(inode, fattr);
-
 	if ((fattr->valid & NFS_ATTR_FATTR_V4) != 0 &&
 			nfsi->change_attr != fattr->change_attr)
 		invalid |= NFS_INO_INVALID_ATTR|NFS_INO_REVAL_PAGECACHE;
@@ -936,10 +933,6 @@ static int nfs_check_inode_attributes(struct inode *inode, struct nfs_fattr *fat
 
 	if (invalid != 0)
 		nfsi->cache_validity |= invalid;
-	else
-		nfsi->cache_validity &= ~(NFS_INO_INVALID_ATTR
-				| NFS_INO_INVALID_ATIME
-				| NFS_INO_REVAL_PAGECACHE);
 
 	nfsi->read_cache_jiffies = fattr->time_start;
 	return 0;