From 458bf6501771863fb4afc47182628f0714525e05 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Sun, 5 Oct 2008 13:31:21 -0400
Subject: [PATCH] --- yaml --- r: 115383 b: refs/heads/master c:
 076f1fc94c44be2664172c63b4a2b51ae2d265ea h: refs/heads/master i:   115381:
 bfd3b347250ba2c128dda759f595312eec2d1959   115379:
 000bc2e6bc2abcc319c66879983e55a9a738304e   115375:
 02e9cf8cb5eef304415c6c97939c34b9e5d418b2 v: v3

---
 [refs]               | 2 +-
 trunk/fs/nfs/inode.c | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index b4f1a36d8f9a..dc707846dbfb 100644
--- 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
index 697157c1fdd1..a2f54154d825 100644
--- 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;