From: Trond Myklebust <trond.myklebust@primarydata.com>
Date: Wed, 19 Mar 2014 17:25:43 +0000 (-0400)
Subject: SUNRPC: Ensure call_status() deals correctly with SOFTCONN tasks
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9455e3f43b017f560daf4289d0fa295a33976f2a;p=linux-beck.git

SUNRPC: Ensure call_status() deals correctly with SOFTCONN tasks

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
---

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index cea1308a6fda..ef96568902c5 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -2004,6 +2004,10 @@ call_status(struct rpc_task *task)
 	case -EHOSTDOWN:
 	case -EHOSTUNREACH:
 	case -ENETUNREACH:
+		if (RPC_IS_SOFTCONN(task)) {
+			rpc_exit(task, status);
+			break;
+		}
 		/*
 		 * Delay any retries for 3 seconds, then handle as if it
 		 * were a timeout.