Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b4d2314b authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4: Don't ignore the NFS_INO_REVAL_FORCED flag in nfs_revalidate_inode() 



If the NFS_INO_REVAL_FORCED flag is set, that means that we don't yet have
an up to date attribute cache. Even if we hold a delegation, we must
put a GETATTR on the wire.

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
Cc: stable@kernel.org
parent 49697ee7

fs/nfs/delegation.h

+6 −0
Original line number Diff line number Diff line
@@ -71,4 +71,10 @@ static inline int nfs_inode_return_delegation(struct inode *inode) 
}

#endif



static inline int nfs_have_delegated_attributes(struct inode *inode)

{

	return nfs_have_delegation(inode, FMODE_READ) &&

		!(NFS_I(inode)->cache_validity & NFS_INO_REVAL_FORCED);

}



#endif

fs/nfs/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -1789,7 +1789,7 @@ static int nfs_access_get_cached(struct inode *inode, struct rpc_cred *cred, str 
	cache = nfs_access_search_rbtree(inode, cred);

	if (cache == NULL)

		goto out;

	if (!nfs_have_delegation(inode, FMODE_READ) &&

	if (!nfs_have_delegated_attributes(inode) &&

	    !time_in_range_open(jiffies, cache->jiffies, cache->jiffies + nfsi->attrtimeo))

		goto out_stale;

	res->jiffies = cache->jiffies;

fs/nfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -729,7 +729,7 @@ int nfs_attribute_timeout(struct inode *inode) 
{

	struct nfs_inode *nfsi = NFS_I(inode);



	if (nfs_have_delegation(inode, FMODE_READ))

	if (nfs_have_delegated_attributes(inode))

		return 0;

	return !time_in_range_open(jiffies, nfsi->read_cache_jiffies, nfsi->read_cache_jiffies + nfsi->attrtimeo);

}