Message ID | 20171114230631.14682-4-JPEWhacker@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index ab6b7c59a117..239a7b5ab135 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -851,11 +851,9 @@ void rpc_shutdown_client(struct rpc_clnt *clnt) clnt->cl_program->name, rcu_dereference(clnt->cl_xprt)->servername); - while (!list_empty(&clnt->cl_tasks)) { - rpc_killall_tasks(clnt); - wait_event_timeout(destroy_wait, - list_empty(&clnt->cl_tasks), 1*HZ); - } + clnt->cl_kill_new_tasks = true; + rpc_killall_tasks(clnt); + wait_event(destroy_wait, list_empty(&clnt->cl_tasks)); rpc_release_client(clnt); }
Use the flag to kill all new tasks when shutting down instead of repeatedly killing all the pending tasks. Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> --- net/sunrpc/clnt.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)