diff options
-rw-r--r-- | include/linux/sunrpc/xprt.h | 1 | ||||
-rw-r--r-- | net/sunrpc/xprtsock.c | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h index 86af854338b5..ae39d478a272 100644 --- a/include/linux/sunrpc/xprt.h +++ b/include/linux/sunrpc/xprt.h | |||
@@ -360,7 +360,6 @@ void xprt_unlock_connect(struct rpc_xprt *, void *); | |||
360 | #define XPRT_BOUND (4) | 360 | #define XPRT_BOUND (4) |
361 | #define XPRT_BINDING (5) | 361 | #define XPRT_BINDING (5) |
362 | #define XPRT_CLOSING (6) | 362 | #define XPRT_CLOSING (6) |
363 | #define XPRT_CONNECTION_ABORT (7) | ||
364 | #define XPRT_CONNECTION_CLOSE (8) | 363 | #define XPRT_CONNECTION_CLOSE (8) |
365 | #define XPRT_CONGESTED (9) | 364 | #define XPRT_CONGESTED (9) |
366 | 365 | ||
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index c65f74019288..2f8db3499a17 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c | |||
@@ -804,7 +804,6 @@ static void xs_error_report(struct sock *sk) | |||
804 | static void xs_sock_reset_connection_flags(struct rpc_xprt *xprt) | 804 | static void xs_sock_reset_connection_flags(struct rpc_xprt *xprt) |
805 | { | 805 | { |
806 | smp_mb__before_atomic(); | 806 | smp_mb__before_atomic(); |
807 | clear_bit(XPRT_CONNECTION_ABORT, &xprt->state); | ||
808 | clear_bit(XPRT_CONNECTION_CLOSE, &xprt->state); | 807 | clear_bit(XPRT_CONNECTION_CLOSE, &xprt->state); |
809 | clear_bit(XPRT_CLOSE_WAIT, &xprt->state); | 808 | clear_bit(XPRT_CLOSE_WAIT, &xprt->state); |
810 | clear_bit(XPRT_CLOSING, &xprt->state); | 809 | clear_bit(XPRT_CLOSING, &xprt->state); |
@@ -1904,7 +1903,6 @@ static int xs_local_setup_socket(struct sock_xprt *transport) | |||
1904 | struct socket *sock; | 1903 | struct socket *sock; |
1905 | int status = -EIO; | 1904 | int status = -EIO; |
1906 | 1905 | ||
1907 | clear_bit(XPRT_CONNECTION_ABORT, &xprt->state); | ||
1908 | status = __sock_create(xprt->xprt_net, AF_LOCAL, | 1906 | status = __sock_create(xprt->xprt_net, AF_LOCAL, |
1909 | SOCK_STREAM, 0, &sock, 1); | 1907 | SOCK_STREAM, 0, &sock, 1); |
1910 | if (status < 0) { | 1908 | if (status < 0) { |
@@ -2149,7 +2147,6 @@ static void xs_tcp_setup_socket(struct work_struct *work) | |||
2149 | int status = -EIO; | 2147 | int status = -EIO; |
2150 | 2148 | ||
2151 | if (!sock) { | 2149 | if (!sock) { |
2152 | clear_bit(XPRT_CONNECTION_ABORT, &xprt->state); | ||
2153 | sock = xs_create_sock(xprt, transport, | 2150 | sock = xs_create_sock(xprt, transport, |
2154 | xs_addr(xprt)->sa_family, SOCK_STREAM, | 2151 | xs_addr(xprt)->sa_family, SOCK_STREAM, |
2155 | IPPROTO_TCP, true); | 2152 | IPPROTO_TCP, true); |