SUNRPC: Replace use of socket sk_callback_lock with sock_lock

Since we do things like setting flags, etc it really is more appropriate
to use sock_lock().

Signed-off-by: Trond Myklebust <[email protected]>

diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 04f1b78bcbca3d3e0f7203c59c46774b1b35fe3e..1c42153025dde0d9d8b8e48068713c481f877b1f 100644 (file)
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -1153,14 +1153,13 @@ static void xs_error_report(struct sock *sk)
        struct sock_xprt *transport;
        struct rpc_xprt *xprt;
 
-       read_lock_bh(&sk->sk_callback_lock);
        if (!(xprt = xprt_from_sock(sk)))
-               goto out;
+               return;
 
        transport = container_of(xprt, struct sock_xprt, xprt);
        transport->xprt_err = -sk->sk_err;
        if (transport->xprt_err == 0)
-               goto out;
+               return;
        dprintk("RPC:       xs_error_report client %p, error=%d...\n",
                        xprt, -transport->xprt_err);
        trace_rpc_socket_error(xprt, sk->sk_socket, transport->xprt_err);
@@ -1168,8 +1167,6 @@ static void xs_error_report(struct sock *sk)
        /* barrier ensures xprt_err is set before XPRT_SOCK_WAKE_ERROR */
        smp_mb__before_atomic();
        xs_run_error_worker(transport, XPRT_SOCK_WAKE_ERROR);
- out:
-       read_unlock_bh(&sk->sk_callback_lock);
 }
 
 static void xs_reset_transport(struct sock_xprt *transport)
@@ -1188,7 +1185,7 @@ static void xs_reset_transport(struct sock_xprt *transport)
        kernel_sock_shutdown(sock, SHUT_RDWR);
 
        mutex_lock(&transport->recv_mutex);
-       write_lock_bh(&sk->sk_callback_lock);
+       lock_sock(sk);
        transport->inet = NULL;
        transport->sock = NULL;
        transport->file = NULL;
@@ -1197,10 +1194,10 @@ static void xs_reset_transport(struct sock_xprt *transport)
 
        xs_restore_old_callbacks(transport, sk);
        xprt_clear_connected(xprt);
-       write_unlock_bh(&sk->sk_callback_lock);
        xs_sock_reset_connection_flags(xprt);
        /* Reset stream record info */
        xs_stream_reset_connect(transport);
+       release_sock(sk);
        mutex_unlock(&transport->recv_mutex);
 
        trace_rpc_socket_close(xprt, sock);
@@ -1364,7 +1361,6 @@ static void xs_data_ready(struct sock *sk)
 {
        struct rpc_xprt *xprt;
 
-       read_lock_bh(&sk->sk_callback_lock);
        dprintk("RPC:       xs_data_ready...\n");
        xprt = xprt_from_sock(sk);
        if (xprt != NULL) {
@@ -1379,7 +1375,6 @@ static void xs_data_ready(struct sock *sk)
                if (!test_and_set_bit(XPRT_SOCK_DATA_READY, &transport->sock_state))
                        queue_work(xprtiod_workqueue, &transport->recv_worker);
        }
-       read_unlock_bh(&sk->sk_callback_lock);
 }
 
 /*
@@ -1408,9 +1403,8 @@ static void xs_tcp_state_change(struct sock *sk)
        struct rpc_xprt *xprt;
        struct sock_xprt *transport;
 
-       read_lock_bh(&sk->sk_callback_lock);
        if (!(xprt = xprt_from_sock(sk)))
-               goto out;
+               return;
        dprintk("RPC:       xs_tcp_state_change client %p...\n", xprt);
        dprintk("RPC:       state %x conn %d dead %d zapped %d sk_shutdown %d\n",
                        sk->sk_state, xprt_connected(xprt),
@@ -1471,8 +1465,6 @@ static void xs_tcp_state_change(struct sock *sk)
                /* Trigger the socket release */
                xs_run_error_worker(transport, XPRT_SOCK_WAKE_DISCONNECT);
        }
- out:
-       read_unlock_bh(&sk->sk_callback_lock);
 }
 
 static void xs_write_space(struct sock *sk)
@@ -1511,13 +1503,9 @@ out:
  */
 static void xs_udp_write_space(struct sock *sk)
 {
-       read_lock_bh(&sk->sk_callback_lock);
-
        /* from net/core/sock.c:sock_def_write_space */
        if (sock_writeable(sk))
                xs_write_space(sk);
-
-       read_unlock_bh(&sk->sk_callback_lock);
 }
 
 /**
@@ -1532,13 +1520,9 @@ static void xs_udp_write_space(struct sock *sk)
  */
 static void xs_tcp_write_space(struct sock *sk)
 {
-       read_lock_bh(&sk->sk_callback_lock);
-
        /* from net/core/stream.c:sk_stream_write_space */
        if (sk_stream_is_writeable(sk))
                xs_write_space(sk);
-
-       read_unlock_bh(&sk->sk_callback_lock);
 }
 
 static void xs_udp_do_set_buffer_size(struct rpc_xprt *xprt)
@@ -1833,7 +1817,7 @@ static int xs_local_finish_connecting(struct rpc_xprt *xprt,
        if (!transport->inet) {
                struct sock *sk = sock->sk;
 
-               write_lock_bh(&sk->sk_callback_lock);
+               lock_sock(sk);
 
                xs_save_old_callbacks(transport, sk);
 
@@ -1849,7 +1833,7 @@ static int xs_local_finish_connecting(struct rpc_xprt *xprt,
                transport->sock = sock;
                transport->inet = sk;
 
-               write_unlock_bh(&sk->sk_callback_lock);
+               release_sock(sk);
        }
 
        xs_stream_start_connect(transport);
@@ -2031,7 +2015,7 @@ static void xs_udp_finish_connecting(struct rpc_xprt *xprt, struct socket *sock)
        if (!transport->inet) {
                struct sock *sk = sock->sk;
 
-               write_lock_bh(&sk->sk_callback_lock);
+               lock_sock(sk);
 
                xs_save_old_callbacks(transport, sk);
 
@@ -2048,7 +2032,7 @@ static void xs_udp_finish_connecting(struct rpc_xprt *xprt, struct socket *sock)
 
                xs_set_memalloc(xprt);
 
-               write_unlock_bh(&sk->sk_callback_lock);
+               release_sock(sk);
        }
        xs_udp_do_set_buffer_size(xprt);
 
@@ -2194,7 +2178,7 @@ static int xs_tcp_finish_connecting(struct rpc_xprt *xprt, struct socket *sock)
                xs_tcp_set_socket_timeouts(xprt, sock);
                tcp_sock_set_nodelay(sk);
 
-               write_lock_bh(&sk->sk_callback_lock);
+               lock_sock(sk);
 
                xs_save_old_callbacks(transport, sk);
 
@@ -2214,7 +2198,7 @@ static int xs_tcp_finish_connecting(struct rpc_xprt *xprt, struct socket *sock)
                transport->sock = sock;
                transport->inet = sk;
 
-               write_unlock_bh(&sk->sk_callback_lock);
+               release_sock(sk);
        }
 
        if (!xprt_bound(xprt))