diff options
| author | David S. Miller <davem@davemloft.net> | 2018-07-30 09:10:25 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-07-30 09:10:25 -0700 |
| commit | b0a0381987dd2be9eb95f7415b110dbb0a7dbe4a (patch) | |
| tree | 307bcd2465bd96bc79cecf60abf50630538117a8 /net/unix/af_unix.c | |
| parent | 3f6bcc5162a1ba4e99e867364919168c1d821308 (diff) | |
| parent | a331de3bf0e66ab2437fc8c5b99bd3c0d9da3088 (diff) | |
Merge branch 'socket-poll-related-cleanups-v2'
Christoph Hellwig says:
====================
socket poll related cleanups v2
A couple of cleanups I stumbled upon when studying the networking
poll code.
Changes since v1:
- drop a dispute patch from this series (to be sent separately)
====================
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 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? */ |