diff options
| author | Trond Myklebust <trond.myklebust@hammerspace.com> | 2019-10-22 13:40:47 -0400 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@hammerspace.com> | 2019-11-03 21:28:46 -0500 |
| commit | af20b7b850c5786979f773ba25dab70c85914466 (patch) | |
| tree | 0ef13a3898df77d2d8c21ff0a0903879698e5a44 | |
| parent | d51f91d262aae047ea3b1496e333a83ce70bb48a (diff) | |
| download | linux-stable-af20b7b850c5786979f773ba25dab70c85914466.tar.gz linux-stable-af20b7b850c5786979f773ba25dab70c85914466.tar.bz2 linux-stable-af20b7b850c5786979f773ba25dab70c85914466.zip | |
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>
| -rw-r--r-- | fs/nfs/delegation.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c index 8c176c921554..ebd83e4db300 100644 --- a/fs/nfs/delegation.c +++ b/fs/nfs/delegation.c @@ -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; } |