|
@@ -195,10 +195,16 @@ bool nfs_check_cache_invalid(struct inode *inode, unsigned long flags)
|
|
|
static void nfs_set_cache_invalid(struct inode *inode, unsigned long flags)
|
|
|
{
|
|
|
struct nfs_inode *nfsi = NFS_I(inode);
|
|
|
- bool have_delegation = nfs_have_delegated_attributes(inode);
|
|
|
+ bool have_delegation = NFS_PROTO(inode)->have_delegation(inode, FMODE_READ);
|
|
|
+
|
|
|
+ if (have_delegation) {
|
|
|
+ if (!(flags & NFS_INO_REVAL_FORCED))
|
|
|
+ flags &= ~NFS_INO_INVALID_OTHER;
|
|
|
+ flags &= ~(NFS_INO_INVALID_CHANGE
|
|
|
+ | NFS_INO_INVALID_SIZE
|
|
|
+ | NFS_INO_REVAL_PAGECACHE);
|
|
|
+ }
|
|
|
|
|
|
- if (have_delegation)
|
|
|
- flags &= ~(NFS_INO_INVALID_CHANGE|NFS_INO_REVAL_PAGECACHE);
|
|
|
if (inode->i_mapping->nrpages == 0)
|
|
|
flags &= ~NFS_INO_INVALID_DATA;
|
|
|
nfsi->cache_validity |= flags;
|