diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-08-29 13:36:30 -0700 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-10-13 03:46:07 +0100 |
| commit | 9434e4855e90d2af3751cd93b47b4a3e40bc2dc1 (patch) | |
| tree | 5b1adce366324195e0922775cf5abc668754990c | |
| parent | cb463364d46787ddf6209db1b5c50386db221ba7 (diff) | |
| download | kernel_samsung_smdk4412-9434e4855e90d2af3751cd93b47b4a3e40bc2dc1.zip kernel_samsung_smdk4412-9434e4855e90d2af3751cd93b47b4a3e40bc2dc1.tar.gz kernel_samsung_smdk4412-9434e4855e90d2af3751cd93b47b4a3e40bc2dc1.tar.bz2 | |
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>
| -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 d77a4f0..3a82fec 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c @@ -811,6 +811,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; @@ -824,6 +825,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; |