[15/28] net/vmw_vsock: convert to ->poll_mask

Message ID	20180321074032.14211-16-hch@lst.de
State	Not Applicable, archived
Delegated to:	David Miller
Headers	show Return-Path: <netdev-owner@vger.kernel.org> From: Christoph Hellwig <hch@lst.de> 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 15/28] net/vmw_vsock: convert to ->poll_mask Date: Wed, 21 Mar 2018 08:40:19 +0100 Message-Id: <20180321074032.14211-16-hch@lst.de> In-Reply-To: <20180321074032.14211-1-hch@lst.de> References: <20180321074032.14211-1-hch@lst.de> Sender: netdev-owner@vger.kernel.org Precedence: bulk
Series	[01/28] fs: unexport poll_schedule_timeout \| expand [01/28] fs: unexport poll_schedule_timeout [02/28] fs: cleanup do_pollfd [03/28] fs: update documentation to mention __poll_t [04/28] fs: add new vfs_poll and file_can_poll helpers [05/28] fs: introduce new ->get_poll_head and ->poll_mask methods [06/28] aio: implement IOCB_CMD_POLL [07/28] net: refactor socket_poll [08/28] net: add support for ->poll_mask in proto_ops [09/28] net: remove sock_no_poll [10/28] net/tcp: convert to ->poll_mask [11/28] net/unix: convert to ->poll_mask [12/28] net: convert datagram_poll users tp ->poll_mask [13/28] net/dccp: convert to ->poll_mask [14/28] net/atm: convert to ->poll_mask [15/28] net/vmw_vsock: convert to ->poll_mask [16/28] net/tipc: convert to ->poll_mask [17/28] net/sctp: convert to ->poll_mask [18/28] net/bluetooth: convert to ->poll_mask [19/28] net/caif: convert to ->poll_mask [20/28] net/nfc: convert to ->poll_mask [21/28] net/phonet: convert to ->poll_mask [22/28] net/iucv: convert to ->poll_mask [23/28] net/rxrpc: convert to ->poll_mask [24/28] crypto: af_alg: convert to ->poll_mask [25/28] pipe: convert to ->poll_mask [26/28] eventfd: switch to ->poll_mask [27/28] timerfd: convert to ->poll_mask [28/28] random: convert to ->poll_mask

Message ID

20180321074032.14211-16-hch@lst.de

State

Not Applicable, archived

Delegated to:

David Miller

Headers

From: Christoph Hellwig <hch@lst.de>
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 15/28] net/vmw_vsock: convert to ->poll_mask
Date: Wed, 21 Mar 2018 08:40:19 +0100
Message-Id: <20180321074032.14211-16-hch@lst.de>
In-Reply-To: <20180321074032.14211-1-hch@lst.de>
References: <20180321074032.14211-1-hch@lst.de>
Sender: netdev-owner@vger.kernel.org
Precedence: bulk

Series

[01/28] fs: unexport poll_schedule_timeout | expand

Commit Message

Christoph Hellwig March 21, 2018, 7:40 a.m. UTC

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 net/vmw_vsock/af_vsock.c | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
index e0fc84daed94..b9210329bda8 100644
--- a/net/vmw_vsock/af_vsock.c
+++ b/net/vmw_vsock/af_vsock.c
@@ -850,18 +850,11 @@  static int vsock_shutdown(struct socket *sock, int mode)
 	return err;
 }
 
-static __poll_t vsock_poll(struct file *file, struct socket *sock,
-			       poll_table *wait)
+static __poll_t vsock_poll_mask(struct socket *sock, __poll_t events)
 {
-	struct sock *sk;
-	__poll_t mask;
-	struct vsock_sock *vsk;
-
-	sk = sock->sk;
-	vsk = vsock_sk(sk);
-
-	poll_wait(file, sk_sleep(sk), wait);
-	mask = 0;
+	struct sock *sk = sock->sk;
+	struct vsock_sock *vsk = vsock_sk(sk);
+	__poll_t mask = 0;
 
 	if (sk->sk_err)
 		/* Signify that there has been an error on this socket. */
@@ -1091,7 +1084,7 @@  static const struct proto_ops vsock_dgram_ops = {
 	.socketpair = sock_no_socketpair,
 	.accept = sock_no_accept,
 	.getname = vsock_getname,
-	.poll = vsock_poll,
+	.poll_mask = vsock_poll_mask,
 	.ioctl = sock_no_ioctl,
 	.listen = sock_no_listen,
 	.shutdown = vsock_shutdown,
@@ -1849,7 +1842,7 @@  static const struct proto_ops vsock_stream_ops = {
 	.socketpair = sock_no_socketpair,
 	.accept = vsock_accept,
 	.getname = vsock_getname,
-	.poll = vsock_poll,
+	.poll_mask = vsock_poll_mask,
 	.ioctl = sock_no_ioctl,
 	.listen = vsock_listen,
 	.shutdown = vsock_shutdown,

[15/28] net/vmw_vsock: convert to ->poll_mask

Commit Message

Patch