On Wed, Jan 29, 2025 at 4:17 PM Dai Ngo <dai.ngo@xxxxxxxxxx> wrote: > > If nfs4_client is in COURTESY state then there is no point to retry > the callback. This causes nfsd4_shutdown_callback to hang since > cl_cb_inflight is not 0. This hang lasts about 15 minutes until TCP > notifies NFSD that the connection was closed. > > This patch modifies nfsd4_cb_sequence_done to skip the restart the > RPC if nfs4_client is in COURTESY state. > Curious, does this patch address the problem seen/discussed in the thread "NFSD threads hang when destroying a session or client ID" or that is something else? > Signed-off-by: Dai Ngo <dai.ngo@xxxxxxxxxx> > --- > fs/nfsd/nfs4callback.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c > index 50e468bdb8d4..c90f94898cc5 100644 > --- a/fs/nfsd/nfs4callback.c > +++ b/fs/nfsd/nfs4callback.c > @@ -1372,6 +1372,11 @@ static bool nfsd4_cb_sequence_done(struct rpc_task *task, struct nfsd4_callback > ret = false; > break; > case 1: > + if (clp->cl_state == NFSD4_COURTESY) { > + nfsd4_mark_cb_fault(cb->cb_clp); > + ret = false; > + break; > + } > /* > * cb_seq_status remains 1 if an RPC Reply was never > * received. NFSD can't know if the client processed > -- > 2.43.5 > >