summaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@hammerspace.com>2021-03-25 14:51:36 -0400
committerTrond Myklebust <trond.myklebust@hammerspace.com>2021-04-13 10:03:03 -0400
commit709fa5769914b377af87962bbe4ff81ffb019b2d (patch)
tree0187e58d82c87f53ab653e04b4491c7424897ea6 /fs/nfs
parent720869eb19f3161980d6d4631d3df7e8c5355993 (diff)
downloadlinux-709fa5769914b377af87962bbe4ff81ffb019b2d.tar.gz
linux-709fa5769914b377af87962bbe4ff81ffb019b2d.tar.bz2
linux-709fa5769914b377af87962bbe4ff81ffb019b2d.zip
NFS: Fix up handling of outstanding layoutcommit in nfs_update_inode()
If there is an outstanding layoutcommit, then the list of attributes whose values are expected to change is not the full set. So let's be explicit about the full list. Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/inode.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 81e3e140e923..18c7277d17a8 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -1933,7 +1933,11 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)
nfs_wcc_update_inode(inode, fattr);
if (pnfs_layoutcommit_outstanding(inode)) {
- nfsi->cache_validity |= save_cache_validity & NFS_INO_INVALID_ATTR;
+ nfsi->cache_validity |=
+ save_cache_validity &
+ (NFS_INO_INVALID_CHANGE | NFS_INO_INVALID_CTIME |
+ NFS_INO_INVALID_MTIME | NFS_INO_INVALID_SIZE |
+ NFS_INO_REVAL_FORCED);
cache_revalidated = false;
}