net: sock_def_readable() and friends RCU conversion

[firefly-linux-kernel-4.4.55.git] / net / core / stream.c

diff --git a/net/core/stream.c b/net/core/stream.c
index 7b3c3f30b1074c7b951ad384c920d0a41b386dc1..cc196f42b8d89a24dd752d11879338d72e80346e 100644 (file)
--- a/net/core/stream.c
+++ b/net/core/stream.c
@@ -28,15 +28,19 @@
 void sk_stream_write_space(struct sock *sk)
 {
        struct socket *sock = sk->sk_socket;
+       struct socket_wq *wq;
 
        if (sk_stream_wspace(sk) >= sk_stream_min_wspace(sk) && sock) {
                clear_bit(SOCK_NOSPACE, &sock->flags);
 
-               if (sk_sleep(sk) && waitqueue_active(sk_sleep(sk)))
-                       wake_up_interruptible_poll(sk_sleep(sk), POLLOUT |
+               rcu_read_lock();
+               wq = rcu_dereference(sk->sk_wq);
+               if (wq_has_sleeper(wq))
+                       wake_up_interruptible_poll(&wq->wait, POLLOUT |
                                                POLLWRNORM | POLLWRBAND);
-               if (sock->fasync_list && !(sk->sk_shutdown & SEND_SHUTDOWN))
+               if (wq && wq->fasync_list && !(sk->sk_shutdown & SEND_SHUTDOWN))
                        sock_wake_async(sock, SOCK_WAKE_SPACE, POLL_OUT);
+               rcu_read_unlock();
        }
 }