diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2014-07-03 00:02:57 -0400 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-02-16 15:12:14 +0100 |
| commit | 0deb7f8cc68902c58b1c735d933f69994709d7e6 (patch) | |
| tree | e2400813dda9b007b6802ed4f359e5979ce3cd38 | |
| parent | 27219fc0724390534b5c462fa14b9dc353334410 (diff) | |
SUNRPC: Handle EPIPE in xprt_connect_status
commit 2fc193cf924ea6eb74f6a0cf73b94b2e62938ae5 upstream.
The callback handler xs_error_report() can end up propagating an EPIPE
error by means of the call to xprt_wake_pending_tasks(). Ensure that
xprt_connect_status() does not automatically convert this into an
EIO error.
Reported-by: Weston Andros Adamson <dros@primarydata.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Acked-by: NeilBrown <neilb@suse.de>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | net/sunrpc/clnt.c | 1 | ||||
| -rw-r--r-- | net/sunrpc/xprt.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index 07a1d5ad2513..8724ef857360 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -1709,6 +1709,7 @@ call_connect_status(struct rpc_task *task) case -ENETUNREACH: case -EHOSTUNREACH: case -ENOBUFS: + case -EPIPE: if (RPC_IS_SOFTCONN(task)) break; /* retry with existing socket, after a delay */ diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c index 92ed62ee5a32..8615b9df4968 100644 --- a/net/sunrpc/xprt.c +++ b/net/sunrpc/xprt.c @@ -750,6 +750,7 @@ static void xprt_connect_status(struct rpc_task *task) case -ECONNABORTED: case -ENETUNREACH: case -EHOSTUNREACH: + case -EPIPE: case -EAGAIN: dprintk("RPC: %5u xprt_connect_status: retrying\n", task->tk_pid); break; |