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>

diff --git a/crypto/af_alg.c b/crypto/af_alg.c
index c166f42..b053179 100644 (file)
--- a/crypto/af_alg.c
+++ b/crypto/af_alg.c
@@ -1071,7 +1071,7 @@ __poll_t af_alg_poll(struct file *file, struct socket *sock,
        struct af_alg_ctx *ctx = ask->private;
        __poll_t mask;
 
-       sock_poll_wait(file, sk_sleep(sk), wait);
+       sock_poll_wait(file, wait);
        mask = 0;
 
        if (!ctx->more || ctx->used)

diff --git a/include/net/sock.h b/include/net/sock.h
index 83b7475..0518f61 100644 (file)
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -2057,16 +2057,17 @@ static inline bool skwq_has_sleeper(struct socket_wq *wq)
 /**
  * sock_poll_wait - place memory barrier behind the poll_wait call.
  * @filp:           file
- * @wait_address:   socket wait queue
  * @p:              poll_table
  *
  * See the comments in the wq_has_sleeper function.
  */
-static inline void sock_poll_wait(struct file *filp,
-               wait_queue_head_t *wait_address, poll_table *p)
+static inline void sock_poll_wait(struct file *filp, poll_table *p)
 {
-       if (!poll_does_not_wait(p) && wait_address) {
-               poll_wait(filp, wait_address, p);
+       struct socket *sock = filp->private_data;
+       wait_queue_head_t *wq = sk_sleep(sock->sk);
+
+       if (!poll_does_not_wait(p) && wq) {
+               poll_wait(filp, wq, p);
                /* We need to be sure we are in sync with the
                 * socket flags modification.
                 *

diff --git a/net/atm/common.c b/net/atm/common.c
index a7a68e5..9f8cb0d 100644 (file)
--- a/net/atm/common.c
+++ b/net/atm/common.c
@@ -653,7 +653,7 @@ __poll_t vcc_poll(struct file *file, struct socket *sock, poll_table *wait)
        struct atm_vcc *vcc;
        __poll_t mask;
 
-       sock_poll_wait(file, sk_sleep(sk), wait);
+       sock_poll_wait(file, wait);
        mask = 0;
 
        vcc = ATM_SD(sock);

diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c
index a6fb1b3..d18965f 100644 (file)
--- a/net/caif/caif_socket.c
+++ b/net/caif/caif_socket.c
@@ -941,7 +941,7 @@ static __poll_t caif_poll(struct file *file,
        __poll_t mask;
        struct caifsock *cf_sk = container_of(sk, struct caifsock, sk);
 
-       sock_poll_wait(file, sk_sleep(sk), wait);
+       sock_poll_wait(file, wait);
        mask = 0;
 
        /* exceptional events? */

diff --git a/net/core/datagram.c b/net/core/datagram.c
index 9938952..9aac0d6 100644 (file)
--- a/net/core/datagram.c
+++ b/net/core/datagram.c
@@ -837,7 +837,7 @@ __poll_t datagram_poll(struct file *file, struct socket *sock,
        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? */

diff --git a/net/dccp/proto.c b/net/dccp/proto.c
index 0d56e36..875858c 100644 (file)
--- a/net/dccp/proto.c
+++ b/net/dccp/proto.c
@@ -325,7 +325,7 @@ __poll_t dccp_poll(struct file *file, struct socket *sock,
        __poll_t mask;
        struct sock *sk = sock->sk;
 
-       sock_poll_wait(file, sk_sleep(sk), wait);
+       sock_poll_wait(file, wait);
        if (sk->sk_state == DCCP_LISTEN)
                return inet_csk_listen_poll(sk);
 

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 514aaac..f3bfb9f 100644 (file)
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -507,7 +507,7 @@ __poll_t tcp_poll(struct file *file, struct socket *sock, poll_table *wait)
        const struct tcp_sock *tp = tcp_sk(sk);
        int state;
 
-       sock_poll_wait(file, sk_sleep(sk), wait);
+       sock_poll_wait(file, wait);
 
        state = inet_sk_state_load(sk);
        if (state == TCP_LISTEN)

diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
index 8d1c43f..92ee91e 100644 (file)
--- a/net/iucv/af_iucv.c
+++ b/net/iucv/af_iucv.c
@@ -1494,7 +1494,7 @@ __poll_t iucv_sock_poll(struct file *file, struct socket *sock,
        struct sock *sk = sock->sk;
        __poll_t mask = 0;
 
-       sock_poll_wait(file, sk_sleep(sk), wait);
+       sock_poll_wait(file, wait);
 
        if (sk->sk_state == IUCV_LISTEN)
                return iucv_accept_poll(sk);

diff --git a/net/nfc/llcp_sock.c b/net/nfc/llcp_sock.c
index ea0c0c6..dd4adf8 100644 (file)
--- a/net/nfc/llcp_sock.c
+++ b/net/nfc/llcp_sock.c
@@ -556,7 +556,7 @@ static __poll_t llcp_sock_poll(struct file *file, struct socket *sock,
 
        pr_debug("%p\n", sk);
 
-       sock_poll_wait(file, sk_sleep(sk), wait);
+       sock_poll_wait(file, wait);
 
        if (sk->sk_state == LLCP_LISTEN)
                return llcp_accept_poll(sk);

diff --git a/net/rxrpc/af_rxrpc.c b/net/rxrpc/af_rxrpc.c
index 2b46304..ac44d8a 100644 (file)
--- a/net/rxrpc/af_rxrpc.c
+++ b/net/rxrpc/af_rxrpc.c
@@ -741,7 +741,7 @@ static __poll_t rxrpc_poll(struct file *file, struct socket *sock,
        struct rxrpc_sock *rx = rxrpc_sk(sk);
        __poll_t mask;
 
-       sock_poll_wait(file, sk_sleep(sk), wait);
+       sock_poll_wait(file, wait);
        mask = 0;
 
        /* the socket is readable if there are any messages waiting on the Rx

diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
index fce7e47..0fc94f2 100644 (file)
--- a/net/smc/af_smc.c
+++ b/net/smc/af_smc.c
@@ -1535,7 +1535,7 @@ static __poll_t smc_poll(struct file *file, struct socket *sock,
                        mask |= EPOLLERR;
        } else {
                if (sk->sk_state != SMC_CLOSED)
-                       sock_poll_wait(file, sk_sleep(sk), wait);
+                       sock_poll_wait(file, wait);
                if (sk->sk_err)
                        mask |= EPOLLERR;
                if ((sk->sk_shutdown == SHUTDOWN_MASK) ||

diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 3d21414..3763bed 100644 (file)
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -716,7 +716,7 @@ static __poll_t tipc_poll(struct file *file, struct socket *sock,
        struct tipc_sock *tsk = tipc_sk(sk);
        __poll_t revents = 0;
 
-       sock_poll_wait(file, sk_sleep(sk), wait);
+       sock_poll_wait(file, wait);
 
        if (sk->sk_shutdown & RCV_SHUTDOWN)
                revents |= EPOLLRDHUP | EPOLLIN | EPOLLRDNORM;

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index e5473c0..1772a0e 100644 (file)
--- 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? */