From bc5163f402025e0d1b4876ac14d20365e3e4ff96 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Fri, 4 Jan 2013 12:50:30 -0500
Subject: [PATCH] --- yaml --- r: 348318 b: refs/heads/master c:
 360e1a534901592b289ba8768fc71b6e6ad49070 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/net/sunrpc/clnt.c | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 1a9122454ce7..060233de330c 100644
--- 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
index 822f020fa7f4..1915ffe598e3 100644
--- 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",