SUNRPC: Remove the bh-safe lock requirement on xprt->transport_lock

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>

1 files changed, 11 insertions, 12 deletions

diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 92af57019b96..97c15d47f343 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -880,7 +880,7 @@ static int xs_nospace(struct rpc_rqst *req)
                         req->rq_slen);
 
         /* Protect against races with write_space */
-        spin_lock_bh(&xprt->transport_lock);
+        spin_lock(&xprt->transport_lock);
 
         /* Don't race with disconnect */
         if (xprt_connected(xprt)) {
@@ -890,7 +890,7 @@ static int xs_nospace(struct rpc_rqst *req)
         } else
                 ret = -ENOTCONN;
 
-        spin_unlock_bh(&xprt->transport_lock);
+        spin_unlock(&xprt->transport_lock);
 
         /* Race breaker in case memory is freed before above code is called */
         if (ret == -EAGAIN) {
@@ -1344,6 +1344,7 @@ static void xs_destroy(struct rpc_xprt *xprt)
         cancel_delayed_work_sync(&transport->connect_worker);
         xs_close(xprt);
         cancel_work_sync(&transport->recv_worker);
+        cancel_work_sync(&transport->error_worker);
         xs_xprt_free(xprt);
         module_put(THIS_MODULE);
 }
@@ -1397,9 +1398,9 @@ static void xs_udp_data_read_skb(struct rpc_xprt *xprt,
         }
 
 
-        spin_lock_bh(&xprt->transport_lock);
+        spin_lock(&xprt->transport_lock);
         xprt_adjust_cwnd(xprt, task, copied);
-        spin_unlock_bh(&xprt->transport_lock);
+        spin_unlock(&xprt->transport_lock);
         spin_lock(&xprt->queue_lock);
         xprt_complete_rqst(task, copied);
         __UDPX_INC_STATS(sk, UDP_MIB_INDATAGRAMS);
@@ -1509,7 +1510,6 @@ static void xs_tcp_state_change(struct sock *sk)
         trace_rpc_socket_state_change(xprt, sk->sk_socket);
         switch (sk->sk_state) {
         case TCP_ESTABLISHED:
-                spin_lock(&xprt->transport_lock);
                 if (!xprt_test_and_set_connected(xprt)) {
                         xprt->connect_cookie++;
                         clear_bit(XPRT_SOCK_CONNECTING, &transport->sock_state);
@@ -1520,7 +1520,6 @@ static void xs_tcp_state_change(struct sock *sk)
                                                    xprt->stat.connect_start;
                         xs_run_error_worker(transport, XPRT_SOCK_WAKE_PENDING);
                 }
-                spin_unlock(&xprt->transport_lock);
                 break;
         case TCP_FIN_WAIT1:
                 /* The client initiated a shutdown of the socket */
@@ -1677,9 +1676,9 @@ static void xs_udp_set_buffer_size(struct rpc_xprt *xprt, size_t sndsize, size_t
  */
 static void xs_udp_timer(struct rpc_xprt *xprt, struct rpc_task *task)
 {
-        spin_lock_bh(&xprt->transport_lock);
+        spin_lock(&xprt->transport_lock);
         xprt_adjust_cwnd(xprt, task, -ETIMEDOUT);
-        spin_unlock_bh(&xprt->transport_lock);
+        spin_unlock(&xprt->transport_lock);
 }
 
 static int xs_get_random_port(void)
@@ -2214,13 +2213,13 @@ static void xs_tcp_set_socket_timeouts(struct rpc_xprt *xprt,
         unsigned int opt_on = 1;
         unsigned int timeo;
 
-        spin_lock_bh(&xprt->transport_lock);
+        spin_lock(&xprt->transport_lock);
         keepidle = DIV_ROUND_UP(xprt->timeout->to_initval, HZ);
         keepcnt = xprt->timeout->to_retries + 1;
         timeo = jiffies_to_msecs(xprt->timeout->to_initval) *
                 (xprt->timeout->to_retries + 1);
         clear_bit(XPRT_SOCK_UPD_TIMEOUT, &transport->sock_state);
-        spin_unlock_bh(&xprt->transport_lock);
+        spin_unlock(&xprt->transport_lock);
 
         /* TCP Keepalive options */
         kernel_setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE,
@@ -2245,7 +2244,7 @@ static void xs_tcp_set_connect_timeout(struct rpc_xprt *xprt,
         struct rpc_timeout to;
         unsigned long initval;
 
-        spin_lock_bh(&xprt->transport_lock);
+        spin_lock(&xprt->transport_lock);
         if (reconnect_timeout < xprt->max_reconnect_timeout)
                 xprt->max_reconnect_timeout = reconnect_timeout;
         if (connect_timeout < xprt->connect_timeout) {
@@ -2262,7 +2261,7 @@ static void xs_tcp_set_connect_timeout(struct rpc_xprt *xprt,
                 xprt->connect_timeout = connect_timeout;
         }
         set_bit(XPRT_SOCK_UPD_TIMEOUT, &transport->sock_state);
-        spin_unlock_bh(&xprt->transport_lock);
+        spin_unlock(&xprt->transport_lock);
 }
 
 static int xs_tcp_finish_connecting(struct rpc_xprt *xprt, struct socket *sock)