diff options
| -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) | |||
| 857 | 857 | ||
| 858 | static void xs_tcp_close(struct rpc_xprt *xprt) | 858 | static void xs_tcp_close(struct rpc_xprt *xprt) |
| 859 | { | 859 | { |
| 860 | if (test_and_clear_bit(XPRT_CONNECTION_CLOSE, &xprt->state)) | 860 | xs_tcp_shutdown(xprt); |
| 861 | xs_close(xprt); | ||
| 862 | else | ||
| 863 | xs_tcp_shutdown(xprt); | ||
| 864 | } | 861 | } |
| 865 | 862 | ||
| 866 | static void xs_xprt_free(struct rpc_xprt *xprt) | 863 | static void xs_xprt_free(struct rpc_xprt *xprt) |
| @@ -1033,7 +1030,6 @@ static void xs_udp_data_ready(struct sock *sk) | |||
| 1033 | */ | 1030 | */ |
| 1034 | static void xs_tcp_force_close(struct rpc_xprt *xprt) | 1031 | static void xs_tcp_force_close(struct rpc_xprt *xprt) |
| 1035 | { | 1032 | { |
| 1036 | set_bit(XPRT_CONNECTION_CLOSE, &xprt->state); | ||
| 1037 | xprt_force_disconnect(xprt); | 1033 | xprt_force_disconnect(xprt); |
| 1038 | } | 1034 | } |
| 1039 | 1035 | ||
