net: use skb_queue_empty_lockless() in poll() handlers

Many poll() handlers are lockless. Using skb_queue_empty_lockless()
instead of skb_queue_empty() is more appropriate.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

14 files changed, 22 insertions, 22 deletions

diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
index c92b405b7646..ba8619524231 100644
--- a/drivers/isdn/capi/capi.c
+++ b/drivers/isdn/capi/capi.c
@@ -744,7 +744,7 @@ capi_poll(struct file *file, poll_table *wait)
 
         poll_wait(file, &(cdev->recvwait), wait);
         mask = EPOLLOUT | EPOLLWRNORM;
-        if (!skb_queue_empty(&cdev->recvqueue))
+        if (!skb_queue_empty_lockless(&cdev->recvqueue))
                 mask |= EPOLLIN | EPOLLRDNORM;
         return mask;
 }
diff --git a/net/atm/common.c b/net/atm/common.c
index b7528e77997c..0ce530af534d 100644
--- a/net/atm/common.c
+++ b/net/atm/common.c
@@ -668,7 +668,7 @@ __poll_t vcc_poll(struct file *file, struct socket *sock, poll_table *wait)
                 mask |= EPOLLHUP;
 
         /* readable? */
-        if (!skb_queue_empty(&sk->sk_receive_queue))
+        if (!skb_queue_empty_lockless(&sk->sk_receive_queue))
                 mask |= EPOLLIN | EPOLLRDNORM;
 
         /* writable? */
diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c
index 94ddf19998c7..5f508c50649d 100644
--- a/net/bluetooth/af_bluetooth.c
+++ b/net/bluetooth/af_bluetooth.c
@@ -460,7 +460,7 @@ __poll_t bt_sock_poll(struct file *file, struct socket *sock,
         if (sk->sk_state == BT_LISTEN)
                 return bt_accept_poll(sk);
 
-        if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue))
+        if (sk->sk_err || !skb_queue_empty_lockless(&sk->sk_error_queue))
                 mask |= EPOLLERR |
                         (sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? EPOLLPRI : 0);
 
@@ -470,7 +470,7 @@ __poll_t bt_sock_poll(struct file *file, struct socket *sock,
         if (sk->sk_shutdown == SHUTDOWN_MASK)
                 mask |= EPOLLHUP;
 
-        if (!skb_queue_empty(&sk->sk_receive_queue))
+        if (!skb_queue_empty_lockless(&sk->sk_receive_queue))
                 mask |= EPOLLIN | EPOLLRDNORM;
 
         if (sk->sk_state == BT_CLOSED)
diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c
index 13ea920600ae..ef14da50a981 100644
--- a/net/caif/caif_socket.c
+++ b/net/caif/caif_socket.c
@@ -953,7 +953,7 @@ static __poll_t caif_poll(struct file *file,
                 mask |= EPOLLRDHUP;
 
         /* readable? */
-        if (!skb_queue_empty(&sk->sk_receive_queue) ||
+        if (!skb_queue_empty_lockless(&sk->sk_receive_queue) ||
                 (sk->sk_shutdown & RCV_SHUTDOWN))
                 mask |= EPOLLIN | EPOLLRDNORM;
 
diff --git a/net/core/datagram.c b/net/core/datagram.c
index c210fc116103..5b685e110aff 100644
--- a/net/core/datagram.c
+++ b/net/core/datagram.c
@@ -767,7 +767,7 @@ __poll_t datagram_poll(struct file *file, struct socket *sock,
         mask = 0;
 
         /* exceptional events? */
-        if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue))
+        if (sk->sk_err || !skb_queue_empty_lockless(&sk->sk_error_queue))
                 mask |= EPOLLERR |
                         (sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? EPOLLPRI : 0);
 
@@ -777,7 +777,7 @@ __poll_t datagram_poll(struct file *file, struct socket *sock,
                 mask |= EPOLLHUP;
 
         /* readable? */
-        if (!skb_queue_empty(&sk->sk_receive_queue))
+        if (!skb_queue_empty_lockless(&sk->sk_receive_queue))
                 mask |= EPOLLIN | EPOLLRDNORM;
 
         /* Connection-based need to check for termination and startup */
diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
index 0ea75286abf4..3349ea81f901 100644
--- a/net/decnet/af_decnet.c
+++ b/net/decnet/af_decnet.c
@@ -1205,7 +1205,7 @@ static __poll_t dn_poll(struct file *file, struct socket *sock, poll_table  *wai
         struct dn_scp *scp = DN_SK(sk);
         __poll_t mask = datagram_poll(file, sock, wait);
 
-        if (!skb_queue_empty(&scp->other_receive_queue))
+        if (!skb_queue_empty_lockless(&scp->other_receive_queue))
                 mask |= EPOLLRDBAND;
 
         return mask;
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 42187a3b82f4..ffef502f5292 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -584,7 +584,7 @@ __poll_t tcp_poll(struct file *file, struct socket *sock, poll_table *wait)
         }
         /* This barrier is coupled with smp_wmb() in tcp_reset() */
         smp_rmb();
-        if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue))
+        if (sk->sk_err || !skb_queue_empty_lockless(&sk->sk_error_queue))
                 mask |= EPOLLERR;
 
         return mask;
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 2cc259736c2e..345a3d43f5a6 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -2712,7 +2712,7 @@ __poll_t udp_poll(struct file *file, struct socket *sock, poll_table *wait)
         __poll_t mask = datagram_poll(file, sock, wait);
         struct sock *sk = sock->sk;
 
-        if (!skb_queue_empty(&udp_sk(sk)->reader_queue))
+        if (!skb_queue_empty_lockless(&udp_sk(sk)->reader_queue))
                 mask |= EPOLLIN | EPOLLRDNORM;
 
         /* Check for false positives due to checksum errors */
diff --git a/net/nfc/llcp_sock.c b/net/nfc/llcp_sock.c
index ccdd790e163a..28604414dec1 100644
--- a/net/nfc/llcp_sock.c
+++ b/net/nfc/llcp_sock.c
@@ -554,11 +554,11 @@ static __poll_t llcp_sock_poll(struct file *file, struct socket *sock,
         if (sk->sk_state == LLCP_LISTEN)
                 return llcp_accept_poll(sk);
 
-        if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue))
+        if (sk->sk_err || !skb_queue_empty_lockless(&sk->sk_error_queue))
                 mask |= EPOLLERR |
                         (sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? EPOLLPRI : 0);
 
-        if (!skb_queue_empty(&sk->sk_receive_queue))
+        if (!skb_queue_empty_lockless(&sk->sk_receive_queue))
                 mask |= EPOLLIN | EPOLLRDNORM;
 
         if (sk->sk_state == LLCP_CLOSED)
diff --git a/net/phonet/socket.c b/net/phonet/socket.c
index 96ea9f254ae9..76d499f6af9a 100644
--- a/net/phonet/socket.c
+++ b/net/phonet/socket.c
@@ -338,9 +338,9 @@ static __poll_t pn_socket_poll(struct file *file, struct socket *sock,
 
         if (sk->sk_state == TCP_CLOSE)
                 return EPOLLERR;
-        if (!skb_queue_empty(&sk->sk_receive_queue))
+        if (!skb_queue_empty_lockless(&sk->sk_receive_queue))
                 mask |= EPOLLIN | EPOLLRDNORM;
-        if (!skb_queue_empty(&pn->ctrlreq_queue))
+        if (!skb_queue_empty_lockless(&pn->ctrlreq_queue))
                 mask |= EPOLLPRI;
         if (!mask && sk->sk_state == TCP_CLOSE_WAIT)
                 return EPOLLHUP;
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 5ca0ec0e823c..cfb25391b8b0 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -8476,7 +8476,7 @@ __poll_t sctp_poll(struct file *file, struct socket *sock, poll_table *wait)
         mask = 0;
 
         /* Is there any exceptional events?  */
-        if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue))
+        if (sk->sk_err || !skb_queue_empty_lockless(&sk->sk_error_queue))
                 mask |= EPOLLERR |
                         (sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? EPOLLPRI : 0);
         if (sk->sk_shutdown & RCV_SHUTDOWN)
@@ -8485,7 +8485,7 @@ __poll_t sctp_poll(struct file *file, struct socket *sock, poll_table *wait)
                 mask |= EPOLLHUP;
 
         /* Is it readable?  Reconsider this code with TCP-style support.  */
-        if (!skb_queue_empty(&sk->sk_receive_queue))
+        if (!skb_queue_empty_lockless(&sk->sk_receive_queue))
                 mask |= EPOLLIN | EPOLLRDNORM;
 
         /* The association is either gone or not ready.  */
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index f8bbc4aab213..4b92b196cfa6 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -740,7 +740,7 @@ static __poll_t tipc_poll(struct file *file, struct socket *sock,
                 /* fall through */
         case TIPC_LISTEN:
         case TIPC_CONNECTING:
-                if (!skb_queue_empty(&sk->sk_receive_queue))
+                if (!skb_queue_empty_lockless(&sk->sk_receive_queue))
                         revents |= EPOLLIN | EPOLLRDNORM;
                 break;
         case TIPC_OPEN:
@@ -748,7 +748,7 @@ static __poll_t tipc_poll(struct file *file, struct socket *sock,
                         revents |= EPOLLOUT;
                 if (!tipc_sk_type_connectionless(sk))
                         break;
-                if (skb_queue_empty(&sk->sk_receive_queue))
+                if (skb_queue_empty_lockless(&sk->sk_receive_queue))
                         break;
                 revents |= EPOLLIN | EPOLLRDNORM;
                 break;
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 67e87db5877f..0d8da809bea2 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -2599,7 +2599,7 @@ static __poll_t unix_poll(struct file *file, struct socket *sock, poll_table *wa
                 mask |= EPOLLRDHUP | EPOLLIN | EPOLLRDNORM;
 
         /* readable? */
-        if (!skb_queue_empty(&sk->sk_receive_queue))
+        if (!skb_queue_empty_lockless(&sk->sk_receive_queue))
                 mask |= EPOLLIN | EPOLLRDNORM;
 
         /* Connection-based need to check for termination and startup */
@@ -2628,7 +2628,7 @@ static __poll_t unix_dgram_poll(struct file *file, struct socket *sock,
         mask = 0;
 
         /* exceptional events? */
-        if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue))
+        if (sk->sk_err || !skb_queue_empty_lockless(&sk->sk_error_queue))
                 mask |= EPOLLERR |
                         (sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? EPOLLPRI : 0);
 
@@ -2638,7 +2638,7 @@ static __poll_t unix_dgram_poll(struct file *file, struct socket *sock,
                 mask |= EPOLLHUP;
 
         /* readable? */
-        if (!skb_queue_empty(&sk->sk_receive_queue))
+        if (!skb_queue_empty_lockless(&sk->sk_receive_queue))
                 mask |= EPOLLIN | EPOLLRDNORM;
 
         /* Connection-based need to check for termination and startup */
diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
index 2ab43b2bba31..582a3e4dfce2 100644
--- a/net/vmw_vsock/af_vsock.c
+++ b/net/vmw_vsock/af_vsock.c
@@ -870,7 +870,7 @@ static __poll_t vsock_poll(struct file *file, struct socket *sock,
                  * the queue and write as long as the socket isn't shutdown for
                  * sending.
                  */
-                if (!skb_queue_empty(&sk->sk_receive_queue) ||
+                if (!skb_queue_empty_lockless(&sk->sk_receive_queue) ||
                     (sk->sk_shutdown & RCV_SHUTDOWN)) {
                         mask |= EPOLLIN | EPOLLRDNORM;
                 }