Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eaf548fe authored by Eric Dumazet's avatar Eric Dumazet Committed by Greg Kroah-Hartman
Browse files

net: use skb_queue_empty_lockless() in poll() handlers 



[ Upstream commit 3ef7cf57c72f32f61e97f8fa401bc39ea1f1a5d4 ]

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

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent afa1f5e9

drivers/isdn/capi/capi.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}

net/atm/common.c

+1 −1
Original line number Diff line number Diff line
@@ -667,7 +667,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? */

net/bluetooth/af_bluetooth.c

+2 −2
Original line number Diff line number Diff line
@@ -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)

net/caif/caif_socket.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

net/core/datagram.c

+2 −2
Original line number Diff line number Diff line
@@ -842,7 +842,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);
@@ -852,7 +852,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 */