]> err.no Git - linux-2.6/commitdiff
NFS: nfs_wcc_update_inode: directory caches are always invalidated
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Sun, 30 Sep 2007 21:03:25 +0000 (17:03 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Tue, 9 Oct 2007 21:18:51 +0000 (17:18 -0400)
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>
fs/nfs/inode.c

index cca1ab2922bfa33572b3dfeeba06dccfbbd7e422..f1f6639f52b5fe839ec21ebf7c048f574350c724 100644 (file)
@@ -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) {