diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-08-29 13:36:30 -0700 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2015-12-06 00:49:08 +0100 |
| commit | 7af536c9e9cb014eb8cf9dc5f4cc67e7226f98a6 (patch) | |
| tree | 9612461e687782b234999555c5530d1f180de424 | |
| parent | 1c16d9c6fc1ecbfe57495e000768cf2c17a44f08 (diff) | |
SUNRPC: xs_reset_transport must mark the connection as disconnected
commit 0c78789e3a030615c6650fde89546cadf40ec2cc upstream.
In case the reconnection attempt fails.
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
[bwh: Backported to 3.2: add local variable xprt]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
(cherry picked from commit 9434e4855e90d2af3751cd93b47b4a3e40bc2dc1)
Signed-off-by: Willy Tarreau <w@1wt.eu>
| -rw-r--r-- | net/sunrpc/xprtsock.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index d37f07c8179f..ec21612bb40f 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c @@ -734,6 +734,7 @@ static void xs_reset_transport(struct sock_xprt *transport) { struct socket *sock = transport->sock; struct sock *sk = transport->inet; + struct rpc_xprt *xprt = &transport->xprt; if (sk == NULL) return; @@ -747,6 +748,7 @@ static void xs_reset_transport(struct sock_xprt *transport) sk->sk_user_data = NULL; xs_restore_old_callbacks(transport, sk); + xprt_clear_connected(xprt); write_unlock_bh(&sk->sk_callback_lock); sk->sk_no_check = 0; |