---

yaml --- r: 348318 b: refs/heads/master c: 360e1a5 h: refs/heads/master v: v3
git-mirror · Jan 4, 2013 · bc5163f · bc5163f
1 parent 17af0f5
commit bc5163f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6db6dd7d3fd8f7c765dabc376493d6791ab28bd6
+refs/heads/master: 360e1a534901592b289ba8768fc71b6e6ad49070
diff --git a/trunk/net/sunrpc/clnt.c b/trunk/net/sunrpc/clnt.c
@@ -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",