From 9d6d2641472b1d96cb33a97fe9acf1829a47ac57 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Sat, 31 Jul 2010 14:29:08 -0400
Subject: [PATCH] --- yaml --- r: 206413 b: refs/heads/master c:
 d6a1ed08c6acea647b3f2aaebe0261f079e1be49 h: refs/heads/master i:   206411:
 5aac564f9831f384db7f2100cb66d5336e90233a v: v3

---
 [refs]                   | 2 +-
 trunk/net/sunrpc/sched.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f421fa41be22..a62b680525f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a17c2153d2e271b0cbacae9bed83b0eaa41db7e1
+refs/heads/master: d6a1ed08c6acea647b3f2aaebe0261f079e1be49
diff --git a/trunk/net/sunrpc/sched.c b/trunk/net/sunrpc/sched.c
index f6db6131fb2e..cace6049e4a5 100644
--- a/trunk/net/sunrpc/sched.c
+++ b/trunk/net/sunrpc/sched.c
@@ -699,8 +699,9 @@ static void __rpc_execute(struct rpc_task *task)
 void rpc_execute(struct rpc_task *task)
 {
 	rpc_set_active(task);
-	rpc_set_running(task);
-	__rpc_execute(task);
+	rpc_make_runnable(task);
+	if (!RPC_IS_ASYNC(task))
+		__rpc_execute(task);
 }
 
 static void rpc_async_schedule(struct work_struct *work)