Commit 488796ec authored by Trond Myklebust's avatar Trond Myklebust
Browse files

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: 1c341b77 ("NFS: Add deferred cache invalidation for close-to-open consistency violations")
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Tested-by: default avatarBenjamin Coddington <bcodding@redhat.com>
Reviewed-by: default avatarBenjamin Coddington <bcodding@redhat.com>
parent eea41330

fs/nfs/inode.c

+7 −2
Original line number Diff line number Diff line
@@ -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);