diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-02-09 09:23:34 -0500 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-02-09 11:20:44 -0500 |
| commit | caf4ccd4e88cf2795c927834bc488c8321437586 (patch) | |
| tree | 34551130a009cc920f907bca6a804f0d380f7814 | |
| parent | 0efeac261c3f79c44fe61ee869722b77805c7ddf (diff) | |
| download | linux-stable-caf4ccd4e88cf2795c927834bc488c8321437586.tar.gz linux-stable-caf4ccd4e88cf2795c927834bc488c8321437586.tar.bz2 linux-stable-caf4ccd4e88cf2795c927834bc488c8321437586.zip | |
SUNRPC: Make xs_tcp_close() do a socket shutdown rather than a sock_release
Use of socket shutdown() means that we monitor the shutdown process
through the xs_tcp_state_change() callback, so it is preferable to
a full close in all cases unless we're destroying the transport.
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
| -rw-r--r-- | net/sunrpc/xprtsock.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 3d83cbd32ef2..0279e8ffb14a 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c @@ -857,10 +857,7 @@ static void xs_close(struct rpc_xprt *xprt) static void xs_tcp_close(struct rpc_xprt *xprt) { - if (test_and_clear_bit(XPRT_CONNECTION_CLOSE, &xprt->state)) - xs_close(xprt); - else - xs_tcp_shutdown(xprt); + xs_tcp_shutdown(xprt); } static void xs_xprt_free(struct rpc_xprt *xprt) @@ -1033,7 +1030,6 @@ static void xs_udp_data_ready(struct sock *sk) */ static void xs_tcp_force_close(struct rpc_xprt *xprt) { - set_bit(XPRT_CONNECTION_CLOSE, &xprt->state); xprt_force_disconnect(xprt); } |