From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Sun, 30 Sep 2007 21:03:25 +0000 (-0400)
Subject: NFS: nfs_wcc_update_inode: directory caches are always invalidated
X-Git-Tag: firefly_0821_release~25901^2~48
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e323ea46d95d7f8c789effd1194dfc120284dbbd;p=firefly-linux-kernel-4.4.55.git

NFS: nfs_wcc_update_inode: directory caches are always invalidated

We must ensure that the readdir data is always invalidated whether or not
the weak cache consistency data update succeeds.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---

diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index cca1ab2922bf..f1f6639f52b5 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -801,6 +801,8 @@ static void nfs_wcc_update_inode(struct inode *inode, struct nfs_fattr *fattr)
 		}
 		if (timespec_equal(&inode->i_mtime, &fattr->pre_mtime)) {
 			memcpy(&inode->i_mtime, &fattr->mtime, sizeof(inode->i_mtime));
+			if (S_ISDIR(inode->i_mode))
+				nfsi->cache_validity |= NFS_INO_INVALID_DATA;
 			nfsi->cache_change_attribute = now;
 		}
 		if (inode->i_size == fattr->pre_size && nfsi->npages == 0) {