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-kernel@vger.kernel.org
Subject: [PATCH 19/31] net/rxrpc: convert to ->poll_mask
Date: Thu, 4 Jan 2018 09:00:31 +0100 [thread overview]
Message-ID: <20180104080043.14506-20-hch@lst.de> (raw)
In-Reply-To: <20180104080043.14506-1-hch@lst.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
net/rxrpc/af_rxrpc.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/net/rxrpc/af_rxrpc.c b/net/rxrpc/af_rxrpc.c
index 21ad6a3a465c..83d9bf60eb22 100644
--- a/net/rxrpc/af_rxrpc.c
+++ b/net/rxrpc/af_rxrpc.c
@@ -729,15 +729,12 @@ 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 file *file, 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 +937,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,
--
2.14.2
next prev parent reply other threads:[~2018-01-04 8:00 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-04 8:00 aio poll, io_pgetevents and a new in-kernel poll API Christoph Hellwig
2018-01-04 8:00 ` [PATCH 01/31] fs: update documentation for __poll_t Christoph Hellwig
2018-01-04 8:00 ` [PATCH 02/31] fs: add new vfs_poll and file_can_poll helpers Christoph Hellwig
2018-01-06 19:08 ` Al Viro
2018-01-08 10:44 ` Christoph Hellwig
2018-01-04 8:00 ` [PATCH 03/31] fs: introduce new ->get_poll_head and ->poll_mask methods Christoph Hellwig
2018-01-06 19:12 ` Al Viro
2018-01-08 10:45 ` Christoph Hellwig
2018-01-10 16:31 ` Al Viro
2018-01-10 17:42 ` Christoph Hellwig
2018-01-04 8:00 ` [PATCH 04/31] net: add support for ->poll_mask in proto_ops Christoph Hellwig
2018-01-06 19:16 ` Al Viro
2018-01-08 10:48 ` Christoph Hellwig
2018-01-09 16:32 ` Christoph Hellwig
2018-01-09 16:41 ` Christoph Hellwig
2018-01-04 8:00 ` [PATCH 05/31] net: remove sock_no_poll Christoph Hellwig
2018-01-04 8:00 ` [PATCH 06/31] net/tcp: convert to ->poll_mask Christoph Hellwig
2018-01-04 8:00 ` [PATCH 07/31] net/unix: " Christoph Hellwig
2018-01-04 8:00 ` [PATCH 08/31] net: convert datagram_poll users tp ->poll_mask Christoph Hellwig
2018-01-04 8:00 ` [PATCH 09/31] net/dccp: convert to ->poll_mask Christoph Hellwig
2018-01-04 8:00 ` [PATCH 10/31] net/atm: " Christoph Hellwig
2018-01-04 8:00 ` [PATCH 11/31] net/vmw_vsock: " Christoph Hellwig
2018-01-04 8:00 ` [PATCH 12/31] net/tipc: " Christoph Hellwig
2018-01-04 8:00 ` [PATCH 13/31] net/sctp: " Christoph Hellwig
2018-01-04 8:00 ` [PATCH 14/31] net/bluetooth: " Christoph Hellwig
2018-01-04 8:00 ` [PATCH 15/31] net/caif: " Christoph Hellwig
2018-01-04 8:00 ` [PATCH 16/31] net/nfc: " Christoph Hellwig
2018-01-04 8:00 ` [PATCH 17/31] net/phonet: " Christoph Hellwig
2018-01-04 8:00 ` [PATCH 18/31] net/iucv: " Christoph Hellwig
2018-01-04 8:00 ` Christoph Hellwig [this message]
2018-01-04 8:00 ` [PATCH 20/31] pipe: " Christoph Hellwig
2018-01-04 8:00 ` [PATCH 21/31] eventfd: switch " Christoph Hellwig
2018-01-04 8:00 ` [PATCH 22/31] timerfd: convert " Christoph Hellwig
2018-01-04 8:00 ` [PATCH 23/31] aio: don't print the page size at boot time Christoph Hellwig
2018-01-09 17:18 ` Jeff Moyer
2018-01-04 8:00 ` [PATCH 24/31] aio: remove an outdated comment in aio_complete Christoph Hellwig
2018-01-09 17:19 ` Jeff Moyer
2018-01-04 8:00 ` [PATCH 25/31] aio: refactor read/write iocb setup Christoph Hellwig
2018-01-04 8:00 ` [PATCH 26/31] aio: sanitize ki_list handling Christoph Hellwig
2018-01-04 8:00 ` [PATCH 27/31] aio: simplify cancellation Christoph Hellwig
2018-01-04 8:00 ` [PATCH 28/31] aio: delete iocbs from the active_reqs list in kiocb_cancel Christoph Hellwig
2018-01-04 8:00 ` [PATCH 29/31] aio: add delayed cancel support Christoph Hellwig
2018-01-04 8:00 ` [PATCH 30/31] aio: implement IOCB_CMD_POLL Christoph Hellwig
2018-01-04 8:00 ` [PATCH 31/31] aio: implement io_pgetevents Christoph Hellwig
2018-01-09 22:16 ` Arnd Bergmann
2018-01-10 8:11 ` Christoph Hellwig
2018-01-10 11:03 ` Arnd Bergmann
2018-01-10 14:59 ` Christoph Hellwig
2018-01-10 15:48 ` Arnd Bergmann
2018-01-10 15:49 ` Christoph Hellwig
2018-01-10 15:56 ` Christoph Hellwig
2018-01-04 9:09 ` aio poll, io_pgetevents and a new in-kernel poll API Christoph Hellwig
2018-01-09 12:28 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180104080043.14506-20-hch@lst.de \
--to=hch@lst.de \
--cc=avi@scylladb.com \
--cc=linux-aio@kvack.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).