summaryrefslogtreecommitdiffstats
path: root/net/unix
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2018-07-30 09:42:10 +0200
committerDavid S. Miller <davem@davemloft.net>2018-07-30 09:10:25 -0700
commitdd979b4df817e9976f18fb6f9d134d6bc4a3c317 (patch)
treefffcfba952d7c3d86fbecaf5a14a213bd0d54967 /net/unix
parent3f6bcc5162a1ba4e99e867364919168c1d821308 (diff)
downloadlinux-dd979b4df817e9976f18fb6f9d134d6bc4a3c317.tar.bz2
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')
-rw-r--r--net/unix/af_unix.c4
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
struct sock *sk = sock->sk;
__poll_t mask;
- sock_poll_wait(file, sk_sleep(sk), wait);
+ sock_poll_wait(file, wait);
mask = 0;
/* exceptional events? */
@@ -2672,7 +2672,7 @@ static __poll_t unix_dgram_poll(struct file *file, struct socket *sock,
unsigned int writable;
__poll_t mask;
- sock_poll_wait(file, sk_sleep(sk), wait);
+ sock_poll_wait(file, wait);
mask = 0;
/* exceptional events? */