diff options
author | Christoph Hellwig <hch@lst.de> | 2018-07-30 03:42:10 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-07-30 12:10:25 -0400 |
commit | dd979b4df817e9976f18fb6f9d134d6bc4a3c317 (patch) | |
tree | fffcfba952d7c3d86fbecaf5a14a213bd0d54967 /net/unix/af_unix.c | |
parent | 3f6bcc5162a1ba4e99e867364919168c1d821308 (diff) |
net: simplify sock_poll_wait
The wait_address argument is always directly derived from the filp
argument, so remove it.
Signed-off-by: Christoph Hellwig <hch@lst.de>
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index e5473c03d667..1772a0e32665 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c | |||
@@ -2635,7 +2635,7 @@ static __poll_t unix_poll(struct file *file, struct socket *sock, poll_table *wa | |||
2635 | struct sock *sk = sock->sk; | 2635 | struct sock *sk = sock->sk; |
2636 | __poll_t mask; | 2636 | __poll_t mask; |
2637 | 2637 | ||
2638 | sock_poll_wait(file, sk_sleep(sk), wait); | 2638 | sock_poll_wait(file, wait); |
2639 | mask = 0; | 2639 | mask = 0; |
2640 | 2640 | ||
2641 | /* exceptional events? */ | 2641 | /* exceptional events? */ |
@@ -2672,7 +2672,7 @@ static __poll_t unix_dgram_poll(struct file *file, struct socket *sock, | |||
2672 | unsigned int writable; | 2672 | unsigned int writable; |
2673 | __poll_t mask; | 2673 | __poll_t mask; |
2674 | 2674 | ||
2675 | sock_poll_wait(file, sk_sleep(sk), wait); | 2675 | sock_poll_wait(file, wait); |
2676 | mask = 0; | 2676 | mask = 0; |
2677 | 2677 | ||
2678 | /* exceptional events? */ | 2678 | /* exceptional events? */ |