Skip to content

Commit 3eba080

Browse files
author
Trond Myklebust
committed
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>
1 parent 2d3e998 commit 3eba080

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

fs/nfs/nfs4proc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9580,7 +9580,7 @@ static void nfs41_sequence_call_done(struct rpc_task *task, void *data)
95809580
return;
95819581

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

fs/nfs/nfs4state.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1198,7 +1198,7 @@ void nfs4_schedule_state_manager(struct nfs_client *clp)
11981198
struct rpc_clnt *clnt = clp->cl_rpcclient;
11991199
bool swapon = false;
12001200

1201-
if (clnt->cl_shutdown)
1201+
if (clp->cl_cons_state < 0)
12021202
return;
12031203

12041204
set_bit(NFS4CLNT_RUN_MANAGER, &clp->cl_state);

0 commit comments

Comments
 (0)