Commit 848fdd62 authored by Trond Myklebust's avatar Trond Myklebust Committed by Anna Schumaker
Browse files

NFS: Don't set NFS_INO_INVALID_XATTR if there is no xattr cache 



Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 28aa2f9e

fs/nfs/inode.c

+14 −0
Original line number Diff line number Diff line
@@ -195,6 +195,18 @@ bool nfs_check_cache_invalid(struct inode *inode, unsigned long flags) 
}

EXPORT_SYMBOL_GPL(nfs_check_cache_invalid);



#ifdef CONFIG_NFS_V4_2

static bool nfs_has_xattr_cache(const struct nfs_inode *nfsi)

{

	return nfsi->xattr_cache != NULL;

}

#else

static bool nfs_has_xattr_cache(const struct nfs_inode *nfsi)

{

	return false;

}

#endif



static void nfs_set_cache_invalid(struct inode *inode, unsigned long flags)

{

	struct nfs_inode *nfsi = NFS_I(inode);
@@ -209,6 +221,8 @@ static void nfs_set_cache_invalid(struct inode *inode, unsigned long flags) 
				| NFS_INO_INVALID_XATTR);

	}



	if (!nfs_has_xattr_cache(nfsi))

		flags &= ~NFS_INO_INVALID_XATTR;

	if (inode->i_mapping->nrpages == 0)

		flags &= ~(NFS_INO_INVALID_DATA|NFS_INO_DATA_INVAL_DEFER);

	nfsi->cache_validity |= flags;