diff options
| -rw-r--r-- | include/linux/sunrpc/xprt.h | 1 | ||||
| -rw-r--r-- | net/sunrpc/xprt.c | 1 | ||||
| -rw-r--r-- | net/sunrpc/xprtsock.c | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h index ae39d478a272..8b93ef53df3c 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_CLOSE (8) | ||
| 364 | #define XPRT_CONGESTED (9) | 363 | #define XPRT_CONGESTED (9) |
| 365 | 364 | ||
| 366 | static inline void xprt_set_connected(struct rpc_xprt *xprt) | 365 | static inline void xprt_set_connected(struct rpc_xprt *xprt) |
diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c index ff3574df8344..e3015aede0d9 100644 --- a/net/sunrpc/xprt.c +++ b/net/sunrpc/xprt.c | |||
| @@ -683,7 +683,6 @@ xprt_init_autodisconnect(unsigned long data) | |||
| 683 | if (test_and_set_bit(XPRT_LOCKED, &xprt->state)) | 683 | if (test_and_set_bit(XPRT_LOCKED, &xprt->state)) |
| 684 | goto out_abort; | 684 | goto out_abort; |
| 685 | spin_unlock(&xprt->transport_lock); | 685 | spin_unlock(&xprt->transport_lock); |
| 686 | set_bit(XPRT_CONNECTION_CLOSE, &xprt->state); | ||
| 687 | queue_work(rpciod_workqueue, &xprt->task_cleanup); | 686 | queue_work(rpciod_workqueue, &xprt->task_cleanup); |
| 688 | return; | 687 | return; |
| 689 | out_abort: | 688 | out_abort: |
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 0279e8ffb14a..c72b13e2bdf5 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_CLOSE, &xprt->state); | ||
| 808 | clear_bit(XPRT_CLOSE_WAIT, &xprt->state); | 807 | clear_bit(XPRT_CLOSE_WAIT, &xprt->state); |
| 809 | clear_bit(XPRT_CLOSING, &xprt->state); | 808 | clear_bit(XPRT_CLOSING, &xprt->state); |
| 810 | smp_mb__after_atomic(); | 809 | smp_mb__after_atomic(); |
