---

yaml --- r: 175946 b: refs/heads/master c: 3a28bec h: refs/heads/master v: v3
git-mirror · Dec 3, 2009 · 13fe2cb · 13fe2cb
1 parent 78a156e
commit 13fe2cb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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",