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

NFSv4: Ignore requests to return the delegation if it was revoked 



If the delegation was revoked, or is already being returned, just
clear the NFS_DELEGATION_RETURN and NFS_DELEGATION_RETURN_IF_CLOSED
flags and keep going.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent d51f91d2

fs/nfs/delegation.c

+4 −3
Original line number Diff line number Diff line
@@ -476,8 +476,6 @@ static bool nfs_delegation_need_return(struct nfs_delegation *delegation) 
{

	bool ret = false;



	if (test_bit(NFS_DELEGATION_RETURNING, &delegation->flags))

		goto out;

	if (test_and_clear_bit(NFS_DELEGATION_RETURN, &delegation->flags))

		ret = true;

	if (test_and_clear_bit(NFS_DELEGATION_RETURN_IF_CLOSED, &delegation->flags) && !ret) {
@@ -489,7 +487,10 @@ static bool nfs_delegation_need_return(struct nfs_delegation *delegation) 
			ret = true;

		spin_unlock(&delegation->lock);

	}

out:

	if (test_bit(NFS_DELEGATION_RETURNING, &delegation->flags) ||

	    test_bit(NFS_DELEGATION_REVOKED, &delegation->flags))

		ret = false;



	return ret;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE