diff options
| author |   Trond Myklebust <trond.myklebust@hammerspace.com> | 2021-09-28 11:15:53 -0400 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@hammerspace.com> | 2021-10-03 20:49:06 -0400 |
| commit | 488796ec1e39fb9194cc8175f770823d40fbf0ed (patch) | |
| tree | e368440dea786f6803966eb7633f1dbf136055a2 /fs/nfs/inode.c | |
| parent | NFS: Default change_attr_type to NFS4_CHANGE_TYPE_IS_UNDEFINED (diff) | |
| download | linux-dev-488796ec1e39fb9194cc8175f770823d40fbf0ed.tar.xz linux-dev-488796ec1e39fb9194cc8175f770823d40fbf0ed.zip | |
NFS: Don't set NFS_INO_DATA_INVAL_DEFER and NFS_INO_INVALID_DATA
NFS_INO_DATA_INVAL_DEFER and NFS_INO_INVALID_DATA should be considered
mutually exclusive.
Fixes: 1c341b777501 ("NFS: Add deferred cache invalidation for close-to-open consistency violations")
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Tested-by: Benjamin Coddington <bcodding@redhat.com>
Reviewed-by: Benjamin Coddington <bcodding@redhat.com>
Diffstat (limited to 'fs/nfs/inode.c')
| -rw-r--r-- | fs/nfs/inode.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index 0f092ccb0ca1..dcb885b7ad73 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c @@ -210,10 +210,15 @@ void nfs_set_cache_invalid(struct inode *inode, unsigned long flags) flags &= ~NFS_INO_INVALID_XATTR; if (flags & NFS_INO_INVALID_DATA) nfs_fscache_invalidate(inode); - if (inode->i_mapping->nrpages == 0) - flags &= ~(NFS_INO_INVALID_DATA|NFS_INO_DATA_INVAL_DEFER); flags &= ~(NFS_INO_REVAL_PAGECACHE | NFS_INO_REVAL_FORCED); + nfsi->cache_validity |= flags; + + if (inode->i_mapping->nrpages == 0) + nfsi->cache_validity &= ~(NFS_INO_INVALID_DATA | + NFS_INO_DATA_INVAL_DEFER); + else if (nfsi->cache_validity & NFS_INO_INVALID_DATA) + nfsi->cache_validity &= ~NFS_INO_DATA_INVAL_DEFER; } EXPORT_SYMBOL_GPL(nfs_set_cache_invalid); |