aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/sunrpc/xprt.c1
-rw-r--r--net/sunrpc/xprtsock.c1
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)
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;
689out_abort: 688out_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)
804static void xs_sock_reset_connection_flags(struct rpc_xprt *xprt) 804static 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();