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>

diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 0f092ccb0ca11dccaeac214be8843199430a6841..dcb885b7ad737367b02ff560266e4dcbe799fbc4 100644 (file)
--- 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);