Commit db40980f authored Sep 06, 2010 by Eric Dumazet Committed by David S. Miller Sep 06, 2010

net: poll() optimizations



No need to test twice sk->sk_shutdown & RCV_SHUTDOWN

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent d61702f1

net/bluetooth/af_bluetooth.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -297,13 +297,12 @@ unsigned int bt_sock_poll(struct file * file, struct socket sock, poll_table w
		mask \|= POLLERR;

		if (sk->sk_shutdown & RCV_SHUTDOWN)
		mask \|= POLLRDHUP;
		mask \|= POLLRDHUP \| POLLIN \| POLLRDNORM;

		if (sk->sk_shutdown == SHUTDOWN_MASK)
		mask \|= POLLHUP;

		if (!skb_queue_empty(&sk->sk_receive_queue) \|\|
		(sk->sk_shutdown & RCV_SHUTDOWN))
		if (!skb_queue_empty(&sk->sk_receive_queue))
		mask \|= POLLIN \| POLLRDNORM;

		if (sk->sk_state == BT_CLOSED)

net/core/datagram.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -746,13 +746,12 @@ unsigned int datagram_poll(struct file file, struct socket sock,
		if (sk->sk_err \|\| !skb_queue_empty(&sk->sk_error_queue))
		mask \|= POLLERR;
		if (sk->sk_shutdown & RCV_SHUTDOWN)
		mask \|= POLLRDHUP;
		mask \|= POLLRDHUP \| POLLIN \| POLLRDNORM;
		if (sk->sk_shutdown == SHUTDOWN_MASK)
		mask \|= POLLHUP;

		/* readable? */
		if (!skb_queue_empty(&sk->sk_receive_queue) \|\|
		(sk->sk_shutdown & RCV_SHUTDOWN))
		if (!skb_queue_empty(&sk->sk_receive_queue))
		mask \|= POLLIN \| POLLRDNORM;

		/* Connection-based need to check for termination and startup */

net/sctp/socket.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -5707,13 +5707,12 @@ unsigned int sctp_poll(struct file file, struct socket sock, poll_table *wait)
		if (sk->sk_err \|\| !skb_queue_empty(&sk->sk_error_queue))
		mask \|= POLLERR;
		if (sk->sk_shutdown & RCV_SHUTDOWN)
		mask \|= POLLRDHUP;
		mask \|= POLLRDHUP \| POLLIN \| POLLRDNORM;
		if (sk->sk_shutdown == SHUTDOWN_MASK)
		mask \|= POLLHUP;

		/* Is it readable? Reconsider this code with TCP-style support. */
		if (!skb_queue_empty(&sk->sk_receive_queue) \|\|
		(sk->sk_shutdown & RCV_SHUTDOWN))
		if (!skb_queue_empty(&sk->sk_receive_queue))
		mask \|= POLLIN \| POLLRDNORM;

		/* The association is either gone or not ready. */

net/unix/af_unix.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -2024,11 +2024,10 @@ static unsigned int unix_poll(struct file file, struct socket sock, poll_table
		if (sk->sk_shutdown == SHUTDOWN_MASK)
		mask \|= POLLHUP;
		if (sk->sk_shutdown & RCV_SHUTDOWN)
		mask \|= POLLRDHUP;
		mask \|= POLLRDHUP \| POLLIN \| POLLRDNORM;

		/* readable? */
		if (!skb_queue_empty(&sk->sk_receive_queue) \|\|
		(sk->sk_shutdown & RCV_SHUTDOWN))
		if (!skb_queue_empty(&sk->sk_receive_queue))
		mask \|= POLLIN \| POLLRDNORM;

		/* Connection-based need to check for termination and startup */