Commit 9e2b9f37 authored by Trond Myklebust's avatar Trond Myklebust

SUNRPC: Remove the redundant XPRT_CONNECTION_CLOSE flag

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent caf4ccd4
...@@ -360,7 +360,6 @@ void xprt_unlock_connect(struct rpc_xprt *, void *); ...@@ -360,7 +360,6 @@ void xprt_unlock_connect(struct rpc_xprt *, void *);
#define XPRT_BOUND (4) #define XPRT_BOUND (4)
#define XPRT_BINDING (5) #define XPRT_BINDING (5)
#define XPRT_CLOSING (6) #define XPRT_CLOSING (6)
#define XPRT_CONNECTION_CLOSE (8)
#define XPRT_CONGESTED (9) #define XPRT_CONGESTED (9)
static inline void xprt_set_connected(struct rpc_xprt *xprt) static inline void xprt_set_connected(struct rpc_xprt *xprt)
......
...@@ -683,7 +683,6 @@ xprt_init_autodisconnect(unsigned long data) ...@@ -683,7 +683,6 @@ xprt_init_autodisconnect(unsigned long data)
if (test_and_set_bit(XPRT_LOCKED, &xprt->state)) if (test_and_set_bit(XPRT_LOCKED, &xprt->state))
goto out_abort; goto out_abort;
spin_unlock(&xprt->transport_lock); spin_unlock(&xprt->transport_lock);
set_bit(XPRT_CONNECTION_CLOSE, &xprt->state);
queue_work(rpciod_workqueue, &xprt->task_cleanup); queue_work(rpciod_workqueue, &xprt->task_cleanup);
return; return;
out_abort: out_abort:
......
...@@ -804,7 +804,6 @@ static void xs_error_report(struct sock *sk) ...@@ -804,7 +804,6 @@ static void xs_error_report(struct sock *sk)
static void xs_sock_reset_connection_flags(struct rpc_xprt *xprt) static void xs_sock_reset_connection_flags(struct rpc_xprt *xprt)
{ {
smp_mb__before_atomic(); smp_mb__before_atomic();
clear_bit(XPRT_CONNECTION_CLOSE, &xprt->state);
clear_bit(XPRT_CLOSE_WAIT, &xprt->state); clear_bit(XPRT_CLOSE_WAIT, &xprt->state);
clear_bit(XPRT_CLOSING, &xprt->state); clear_bit(XPRT_CLOSING, &xprt->state);
smp_mb__after_atomic(); smp_mb__after_atomic();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment