diff mbox series

[31/36] net/rxrpc: convert to ->poll_mask

Message ID	20180122201243.31610-32-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 31/36] net/rxrpc: convert to ->poll_mask Date: Mon, 22 Jan 2018 21:12:38 +0100 Message-Id: <20180122201243.31610-32-hch@lst.de> In-Reply-To: <20180122201243.31610-1-hch@lst.de> References: <20180122201243.31610-1-hch@lst.de> Sender: netdev-owner@vger.kernel.org Precedence: bulk
Series	[01/36] aio: don't print the page size at boot time \| expand [01/36] aio: don't print the page size at boot time [02/36] aio: remove an outdated comment in aio_complete [03/36] aio: refactor read/write iocb setup [04/36] aio: sanitize ki_list handling [05/36] aio: simplify cancellation [06/36] aio: delete iocbs from the active_reqs list in kiocb_cancel [07/36] aio: add delayed cancel support [08/36] aio: implement io_pgetevents [09/36] fs: unexport poll_schedule_timeout [10/36] fs: cleanup do_pollfd [11/36] fs: update documentation for __poll_t [12/36] fs: add new vfs_poll and file_can_poll helpers [13/36] fs: introduce new ->get_poll_head and ->poll_mask methods [14/36] aio: implement IOCB_CMD_POLL [15/36] net: refactor socket_poll [16/36] net: add support for ->poll_mask in proto_ops [17/36] net: remove sock_no_poll [18/36] net/tcp: convert to ->poll_mask [19/36] net/unix: convert to ->poll_mask [20/36] net: convert datagram_poll users tp ->poll_mask [21/36] net/dccp: convert to ->poll_mask [22/36] net/atm: convert to ->poll_mask [23/36] net/vmw_vsock: convert to ->poll_mask [24/36] net/tipc: convert to ->poll_mask [25/36] net/sctp: convert to ->poll_mask [26/36] net/bluetooth: convert to ->poll_mask [27/36] net/caif: convert to ->poll_mask [28/36] net/nfc: convert to ->poll_mask [29/36] net/phonet: convert to ->poll_mask [30/36] net/iucv: convert to ->poll_mask [31/36] net/rxrpc: convert to ->poll_mask [32/36] crypto: af_alg: convert to ->poll_mask [33/36] pipe: convert to ->poll_mask [34/36] eventfd: switch to ->poll_mask [35/36] timerfd: convert to ->poll_mask [36/36] random: convert to ->poll_mask

Commit Message

Christoph Hellwig Jan. 22, 2018, 8:12 p.m. UTC

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 net/rxrpc/af_rxrpc.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff mbox series

Patch

diff --git a/net/rxrpc/af_rxrpc.c b/net/rxrpc/af_rxrpc.c
index 21ad6a3a465c..46d393ef99e0 100644
--- a/net/rxrpc/af_rxrpc.c
+++ b/net/rxrpc/af_rxrpc.c
@@ -729,15 +729,11 @@  static int rxrpc_getsockopt(struct socket *sock, int level, int optname,
 /*
  * permit an RxRPC socket to be polled
  */
-static __poll_t rxrpc_poll(struct file *file, struct socket *sock,
-			       poll_table *wait)
+static __poll_t rxrpc_poll_mask(struct socket *sock, __poll_t events)
 {
 	struct sock *sk = sock->sk;
 	struct rxrpc_sock *rx = rxrpc_sk(sk);
-	__poll_t mask;
-
-	sock_poll_wait(file, sk_sleep(sk), wait);
-	mask = 0;
+	__poll_t mask = 0;
 
 	/* the socket is readable if there are any messages waiting on the Rx
 	 * queue */
@@ -940,7 +936,7 @@  static const struct proto_ops rxrpc_rpc_ops = {
 	.socketpair	= sock_no_socketpair,
 	.accept		= sock_no_accept,
 	.getname	= sock_no_getname,
-	.poll		= rxrpc_poll,
+	.poll_mask	= rxrpc_poll_mask,
 	.ioctl		= sock_no_ioctl,
 	.listen		= rxrpc_listen,
 	.shutdown	= rxrpc_shutdown,