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 /net | |
| parent | caf4ccd4e88cf2795c927834bc488c8321437586 (diff) | |
| download | linux-stable-9e2b9f37760e129cee053cc7b6e7288acc2a7134.tar.gz linux-stable-9e2b9f37760e129cee053cc7b6e7288acc2a7134.tar.bz2 linux-stable-9e2b9f37760e129cee053cc7b6e7288acc2a7134.zip | |
SUNRPC: Remove the redundant XPRT_CONNECTION_CLOSE flag
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/sunrpc/xprt.c | 1 | ||||
| -rw-r--r-- | net/sunrpc/xprtsock.c | 1 |
2 files changed, 0 insertions, 2 deletions
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) if (test_and_set_bit(XPRT_LOCKED, &xprt->state)) goto out_abort; spin_unlock(&xprt->transport_lock); - set_bit(XPRT_CONNECTION_CLOSE, &xprt->state); queue_work(rpciod_workqueue, &xprt->task_cleanup); return; 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) static void xs_sock_reset_connection_flags(struct rpc_xprt *xprt) { smp_mb__before_atomic(); - clear_bit(XPRT_CONNECTION_CLOSE, &xprt->state); clear_bit(XPRT_CLOSE_WAIT, &xprt->state); clear_bit(XPRT_CLOSING, &xprt->state); smp_mb__after_atomic(); |