Commit 3eba080e authored Mar 25, 2025 by Trond Myklebust

NFSv4: Further cleanups to shutdown loops



Replace the tests for the RPC client being shut down with tests for
whether the nfs_client is in an error state.

Reviewed-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: Benjamin Coddington <bcodding@redhat.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>

parent 2d3e998a

fs/nfs/nfs4proc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -9580,7 +9580,7 @@ static void nfs41_sequence_call_done(struct rpc_task task, void data)
		return;

		trace_nfs4_sequence(clp, task->tk_status);
		if (task->tk_status < 0 && !task->tk_client->cl_shutdown) {
		if (task->tk_status < 0 && clp->cl_cons_state >= 0) {
		dprintk("%s ERROR %d\n", __func__, task->tk_status);
		if (refcount_read(&clp->cl_count) == 1)
		return;

fs/nfs/nfs4state.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1198,7 +1198,7 @@ void nfs4_schedule_state_manager(struct nfs_client *clp)
		struct rpc_clnt *clnt = clp->cl_rpcclient;
		bool swapon = false;

		if (clnt->cl_shutdown)
		if (clp->cl_cons_state < 0)
		return;

		set_bit(NFS4CLNT_RUN_MANAGER, &clp->cl_state);