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>

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index a31ba0e4ef2fe42634ab01c9f1d78b46cc859158..e8b41c5e51471e53ddada3947defab8082957df3 100644 (file)
--- 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) {