Skip to content

Commit

Permalink
SUNRPC: Partial revert of commit 168e4b3
Browse files Browse the repository at this point in the history
Partially revert commit (SUNRPC: add WARN_ON_ONCE for potential deadlock).
The looping behaviour has been tracked down to a knownn issue with
workqueues, and a workaround has now been implemented.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Cc: Weston Andros Adamson <dros@netapp.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Bruce Fields <bfields@fieldses.org>
Cc: stable@vger.kernel.org [>= 3.7]
  • Loading branch information
Trond Myklebust authored and Trond Myklebust committed Jan 4, 2013
1 parent 6db6dd7 commit 360e1a5
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions net/sunrpc/clnt.c
Original file line number Diff line number Diff line change
Expand Up @@ -610,11 +610,6 @@ EXPORT_SYMBOL_GPL(rpc_killall_tasks);
*/
void rpc_shutdown_client(struct rpc_clnt *clnt)
{
/*
* To avoid deadlock, never call rpc_shutdown_client from a
* workqueue context!
*/
WARN_ON_ONCE(current->flags & PF_WQ_WORKER);
might_sleep();

dprintk_rcu("RPC: shutting down %s client for %s\n",
Expand Down

0 comments on commit 360e1a5

Please sign in to comment.