diff options
author | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-02-08 19:21:27 -0500 |
---|---|---|
committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-02-09 11:26:06 -0500 |
commit | 9e2b9f37760e129cee053cc7b6e7288acc2a7134 (patch) | |
tree | b25eeceb223b91e2be8c1cdfa829e1738e2166f0 | |
parent | caf4ccd4e88cf2795c927834bc488c8321437586 (diff) |
SUNRPC: Remove the redundant XPRT_CONNECTION_CLOSE flag
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
-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(); |