From 13fe2cbe2b018385cfccbe38f76097ff2b523ee5 Mon Sep 17 00:00:00 2001
From: Chuck Lever <chuck.lever@oracle.com>
Date: Thu, 3 Dec 2009 15:58:56 -0500
Subject: [PATCH] --- yaml --- r: 175946 b: refs/heads/master c:
 3a28becc35e5c8f1fabb707bcd8a473712653de6 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/net/sunrpc/clnt.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index cd00fecb228e..7c6b1f7acdbb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: caabea8a565fb4e16f8e58e16bb9d535e591b709
+refs/heads/master: 3a28becc35e5c8f1fabb707bcd8a473712653de6
diff --git a/trunk/net/sunrpc/clnt.c b/trunk/net/sunrpc/clnt.c
index 97931d9f8579..154034b675bd 100644
--- a/trunk/net/sunrpc/clnt.c
+++ b/trunk/net/sunrpc/clnt.c
@@ -1380,6 +1380,10 @@ call_timeout(struct rpc_task *task)
 	dprintk("RPC: %5u call_timeout (major)\n", task->tk_pid);
 	task->tk_timeouts++;
 
+	if (RPC_IS_SOFTCONN(task)) {
+		rpc_exit(task, -ETIMEDOUT);
+		return;
+	}
 	if (RPC_IS_SOFT(task)) {
 		if (clnt->cl_chatty)
 			printk(KERN_NOTICE "%s: server %s not responding, timed out\n",