diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2014-07-03 00:02:57 -0400 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2014-07-03 00:11:35 -0400 |
| commit | 2fc193cf924ea6eb74f6a0cf73b94b2e62938ae5 (patch) | |
| tree | a500d506982686c8cf3c173aa30ec2f36752df5b /net/sunrpc | |
| parent | 3601c4a91ebbbf1cf69f66a2abeffc6c64a4fe64 (diff) | |
| download | linux-stable-2fc193cf924ea6eb74f6a0cf73b94b2e62938ae5.tar.gz linux-stable-2fc193cf924ea6eb74f6a0cf73b94b2e62938ae5.tar.bz2 linux-stable-2fc193cf924ea6eb74f6a0cf73b94b2e62938ae5.zip | |
SUNRPC: Handle EPIPE in xprt_connect_status
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>
Diffstat (limited to 'net/sunrpc')
| -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 575e63f6c13e..488ddeed9363 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -1814,6 +1814,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 c3b2b3369e52..c5b2916298b0 100644 --- a/net/sunrpc/xprt.c +++ b/net/sunrpc/xprt.c @@ -744,6 +744,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; |