diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-09-06 07:13:50 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-06 21:48:45 -0400 |
| commit | db40980fcdb560d7992b0511df16cdd3f7e381f3 (patch) | |
| tree | 337b5c41bd55915a4b894ea6fe09a865e7dcb0e4 /net/unix/af_unix.c | |
| parent | d61702f1273b71c2809365a7806d7fe84fd77f15 (diff) | |
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>
Diffstat (limited to 'net/unix/af_unix.c')
| -rw-r--r-- | net/unix/af_unix.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 4414a18c63b4..9077b4ea00c5 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c | |||
| @@ -2024,11 +2024,10 @@ static unsigned int unix_poll(struct file *file, struct socket *sock, poll_table | |||
| 2024 | if (sk->sk_shutdown == SHUTDOWN_MASK) | 2024 | if (sk->sk_shutdown == SHUTDOWN_MASK) |
| 2025 | mask |= POLLHUP; | 2025 | mask |= POLLHUP; |
| 2026 | if (sk->sk_shutdown & RCV_SHUTDOWN) | 2026 | if (sk->sk_shutdown & RCV_SHUTDOWN) |
| 2027 | mask |= POLLRDHUP; | 2027 | mask |= POLLRDHUP | POLLIN | POLLRDNORM; |
| 2028 | 2028 | ||
| 2029 | /* readable? */ | 2029 | /* readable? */ |
| 2030 | if (!skb_queue_empty(&sk->sk_receive_queue) || | 2030 | if (!skb_queue_empty(&sk->sk_receive_queue)) |
| 2031 | (sk->sk_shutdown & RCV_SHUTDOWN)) | ||
| 2032 | mask |= POLLIN | POLLRDNORM; | 2031 | mask |= POLLIN | POLLRDNORM; |
| 2033 | 2032 | ||
| 2034 | /* Connection-based need to check for termination and startup */ | 2033 | /* Connection-based need to check for termination and startup */ |