diff mbox

[13/32] net/tipc: convert to ->poll_mask

Message ID 20180110155853.32348-14-hch@lst.de (mailing list archive)
State New, archived
Headers show

Commit Message

Christoph Hellwig Jan. 10, 2018, 3:58 p.m. UTC 
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 net/tipc/socket.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

Comments

Jon Maloy Jan. 10, 2018, 7:32 p.m. UTC | #1 
Acked.
///jon

> -----Original Message-----
> From: netdev-owner@vger.kernel.org [mailto:netdev-
> owner@vger.kernel.org] On Behalf Of Christoph Hellwig
> Sent: Wednesday, January 10, 2018 10:59
> To: viro@zeniv.linux.org.uk
> Cc: Avi Kivity <avi@scylladb.com>; linux-aio@kvack.org; linux-
> fsdevel@vger.kernel.org; netdev@vger.kernel.org; linux-
> api@vger.kernel.org; linux-kernel@vger.kernel.org
> Subject: [PATCH 13/32] net/tipc: convert to ->poll_mask
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
>  net/tipc/socket.c | 14 +++++---------
>  1 file changed, 5 insertions(+), 9 deletions(-)
> 
> diff --git a/net/tipc/socket.c b/net/tipc/socket.c index
> fcbd6489a8b5..527d113c38b0 100644
> --- a/net/tipc/socket.c
> +++ b/net/tipc/socket.c
> @@ -693,10 +693,9 @@ static int tipc_getname(struct socket *sock, struct
> sockaddr *uaddr,  }
> 
>  /**
> - * tipc_poll - read and possibly block on pollmask
> + * tipc_poll - read pollmask
>   * @file: file structure associated with the socket
>   * @sock: socket for which to calculate the poll bits
> - * @wait: ???
>   *
>   * Returns pollmask value
>   *
> @@ -710,16 +709,13 @@ static int tipc_getname(struct socket *sock, struct
> sockaddr *uaddr,
>   * imply that the operation will succeed, merely that it should be performed
>   * and will not block.
>   */
> -static __poll_t tipc_poll(struct file *file, struct socket *sock,
> -			      poll_table *wait)
> +static __poll_t tipc_poll_mask(struct socket *sock, __poll_t events)
>  {
>  	struct sock *sk = sock->sk;
>  	struct tipc_sock *tsk = tipc_sk(sk);
>  	struct tipc_group *grp = tsk->group;
>  	__poll_t revents = 0;
> 
> -	sock_poll_wait(file, sk_sleep(sk), wait);
> -
>  	if (sk->sk_shutdown & RCV_SHUTDOWN)
>  		revents |= POLLRDHUP | POLLIN | POLLRDNORM;
>  	if (sk->sk_shutdown == SHUTDOWN_MASK)
> @@ -3005,7 +3001,7 @@ static const struct proto_ops msg_ops = {
>  	.socketpair	= tipc_socketpair,
>  	.accept		= sock_no_accept,
>  	.getname	= tipc_getname,
> -	.poll		= tipc_poll,
> +	.poll_mask	= tipc_poll_mask,
>  	.ioctl		= tipc_ioctl,
>  	.listen		= sock_no_listen,
>  	.shutdown	= tipc_shutdown,
> @@ -3026,7 +3022,7 @@ static const struct proto_ops packet_ops = {
>  	.socketpair	= tipc_socketpair,
>  	.accept		= tipc_accept,
>  	.getname	= tipc_getname,
> -	.poll		= tipc_poll,
> +	.poll_mask	= tipc_poll_mask,
>  	.ioctl		= tipc_ioctl,
>  	.listen		= tipc_listen,
>  	.shutdown	= tipc_shutdown,
> @@ -3047,7 +3043,7 @@ static const struct proto_ops stream_ops = {
>  	.socketpair	= tipc_socketpair,
>  	.accept		= tipc_accept,
>  	.getname	= tipc_getname,
> -	.poll		= tipc_poll,
> +	.poll_mask	= tipc_poll_mask,
>  	.ioctl		= tipc_ioctl,
>  	.listen		= tipc_listen,
>  	.shutdown	= tipc_shutdown,
> --
> 2.14.2
diff mbox

Patch

diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index fcbd6489a8b5..527d113c38b0 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -693,10 +693,9 @@  static int tipc_getname(struct socket *sock, struct sockaddr *uaddr,
 }
 
 /**
- * tipc_poll - read and possibly block on pollmask
+ * tipc_poll - read pollmask
  * @file: file structure associated with the socket
  * @sock: socket for which to calculate the poll bits
- * @wait: ???
  *
  * Returns pollmask value
  *
@@ -710,16 +709,13 @@  static int tipc_getname(struct socket *sock, struct sockaddr *uaddr,
  * imply that the operation will succeed, merely that it should be performed
  * and will not block.
  */
-static __poll_t tipc_poll(struct file *file, struct socket *sock,
-			      poll_table *wait)
+static __poll_t tipc_poll_mask(struct socket *sock, __poll_t events)
 {
 	struct sock *sk = sock->sk;
 	struct tipc_sock *tsk = tipc_sk(sk);
 	struct tipc_group *grp = tsk->group;
 	__poll_t revents = 0;
 
-	sock_poll_wait(file, sk_sleep(sk), wait);
-
 	if (sk->sk_shutdown & RCV_SHUTDOWN)
 		revents |= POLLRDHUP | POLLIN | POLLRDNORM;
 	if (sk->sk_shutdown == SHUTDOWN_MASK)
@@ -3005,7 +3001,7 @@  static const struct proto_ops msg_ops = {
 	.socketpair	= tipc_socketpair,
 	.accept		= sock_no_accept,
 	.getname	= tipc_getname,
-	.poll		= tipc_poll,
+	.poll_mask	= tipc_poll_mask,
 	.ioctl		= tipc_ioctl,
 	.listen		= sock_no_listen,
 	.shutdown	= tipc_shutdown,
@@ -3026,7 +3022,7 @@  static const struct proto_ops packet_ops = {
 	.socketpair	= tipc_socketpair,
 	.accept		= tipc_accept,
 	.getname	= tipc_getname,
-	.poll		= tipc_poll,
+	.poll_mask	= tipc_poll_mask,
 	.ioctl		= tipc_ioctl,
 	.listen		= tipc_listen,
 	.shutdown	= tipc_shutdown,
@@ -3047,7 +3043,7 @@  static const struct proto_ops stream_ops = {
 	.socketpair	= tipc_socketpair,
 	.accept		= tipc_accept,
 	.getname	= tipc_getname,
-	.poll		= tipc_poll,
+	.poll_mask	= tipc_poll_mask,
 	.ioctl		= tipc_ioctl,
 	.listen		= tipc_listen,
 	.shutdown	= tipc_shutdown,