diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2020-07-31 16:20:05 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2020-09-25 18:01:26 -0400 |
| commit | 12ed22f3c3dc75687ec532534aa01cd41111c1f8 (patch) | |
| tree | 2190e06814bb7faf9afbe250fc3050d30924cc63 /fs/nfsd | |
| parent | e56dc9e2949edff7932474f2552dd134734cc857 (diff) | |
| download | linux-12ed22f3c3dc75687ec532534aa01cd41111c1f8.tar.gz | |
nfsd: give up callbacks on revoked delegations
The delegation is no longer returnable, so I don't think there's much
point retrying the recall.
(I think it's worth asking why we even need separate CLOSED_DELEG and
REVOKED_DELEG states. But treating them the same would currently cause
nfsd4_free_stateid to call list_del_init(&dp->dl_recall_lru) on a
delegation that the laundromat had unhashed but not revoked, incorrectly
removing it from the laundromat's reaplist or a client's dl_recall_lru.)
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index a31ba0e4ef2f..e8b41c5e5147 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -4513,7 +4513,8 @@ static int nfsd4_cb_recall_done(struct nfsd4_callback *cb, { struct nfs4_delegation *dp = cb_to_delegation(cb); - if (dp->dl_stid.sc_type == NFS4_CLOSED_DELEG_STID) + if (dp->dl_stid.sc_type == NFS4_CLOSED_DELEG_STID || + dp->dl_stid.sc_type == NFS4_REVOKED_DELEG_STID) return 1; switch (task->tk_status) { |