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: Trond Myklebust <trond.myklebust@hammerspace.com>
This commit is contained in:
parent
d51f91d262
commit
af20b7b850
@ -476,8 +476,6 @@ static bool nfs_delegation_need_return(struct nfs_delegation *delegation)
|
|||||||
{
|
{
|
||||||
bool ret = false;
|
bool ret = false;
|
||||||
|
|
||||||
if (test_bit(NFS_DELEGATION_RETURNING, &delegation->flags))
|
|
||||||
goto out;
|
|
||||||
if (test_and_clear_bit(NFS_DELEGATION_RETURN, &delegation->flags))
|
if (test_and_clear_bit(NFS_DELEGATION_RETURN, &delegation->flags))
|
||||||
ret = true;
|
ret = true;
|
||||||
if (test_and_clear_bit(NFS_DELEGATION_RETURN_IF_CLOSED, &delegation->flags) && !ret) {
|
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;
|
ret = true;
|
||||||
spin_unlock(&delegation->lock);
|
spin_unlock(&delegation->lock);
|
||||||
}
|
}
|
||||||
out:
|
if (test_bit(NFS_DELEGATION_RETURNING, &delegation->flags) ||
|
||||||
|
test_bit(NFS_DELEGATION_REVOKED, &delegation->flags))
|
||||||
|
ret = false;
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user