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 24/36] net/tipc: convert to ->poll_mask
Date: Mon, 22 Jan 2018 21:12:31 +0100 [thread overview]
Message-ID: <20180122201243.31610-25-hch@lst.de> (raw)
In-Reply-To: <20180122201243.31610-1-hch@lst.de>
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
next prev parent reply other threads:[~2018-01-22 20:20 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-22 20:12 aio poll, io_pgetevents and a new in-kernel poll API V4 Christoph Hellwig
2018-01-22 20:12 ` [PATCH 01/36] aio: don't print the page size at boot time Christoph Hellwig
2018-01-22 20:12 ` [PATCH 02/36] aio: remove an outdated comment in aio_complete Christoph Hellwig
2018-01-22 20:12 ` [PATCH 03/36] aio: refactor read/write iocb setup Christoph Hellwig
2018-01-22 20:12 ` [PATCH 04/36] aio: sanitize ki_list handling Christoph Hellwig
2018-01-22 20:12 ` [PATCH 05/36] aio: simplify cancellation Christoph Hellwig
2018-01-22 20:12 ` [PATCH 06/36] aio: delete iocbs from the active_reqs list in kiocb_cancel Christoph Hellwig
2018-01-22 20:12 ` [PATCH 07/36] aio: add delayed cancel support Christoph Hellwig
2018-01-22 20:12 ` [PATCH 08/36] aio: implement io_pgetevents Christoph Hellwig
2018-01-24 19:24 ` Jeff Moyer
2018-01-22 20:12 ` [PATCH 09/36] fs: unexport poll_schedule_timeout Christoph Hellwig
2018-01-22 20:12 ` [PATCH 10/36] fs: cleanup do_pollfd Christoph Hellwig
2018-01-22 20:12 ` [PATCH 11/36] fs: update documentation for __poll_t Christoph Hellwig
2018-01-22 20:12 ` [PATCH 12/36] fs: add new vfs_poll and file_can_poll helpers Christoph Hellwig
2018-01-22 20:12 ` [PATCH 13/36] fs: introduce new ->get_poll_head and ->poll_mask methods Christoph Hellwig
2018-01-22 20:12 ` [PATCH 14/36] aio: implement IOCB_CMD_POLL Christoph Hellwig
2018-01-24 19:24 ` Jeff Moyer
2018-01-22 20:12 ` [PATCH 15/36] net: refactor socket_poll Christoph Hellwig
2018-01-22 20:12 ` [PATCH 16/36] net: add support for ->poll_mask in proto_ops Christoph Hellwig
2018-01-22 20:12 ` [PATCH 17/36] net: remove sock_no_poll Christoph Hellwig
2018-01-22 20:12 ` [PATCH 18/36] net/tcp: convert to ->poll_mask Christoph Hellwig
2018-01-22 20:12 ` [PATCH 19/36] net/unix: " Christoph Hellwig
2018-01-22 20:12 ` [PATCH 20/36] net: convert datagram_poll users tp ->poll_mask Christoph Hellwig
2018-01-22 20:12 ` [PATCH 21/36] net/dccp: convert to ->poll_mask Christoph Hellwig
2018-01-22 20:12 ` [PATCH 22/36] net/atm: " Christoph Hellwig
2018-01-22 20:12 ` [PATCH 23/36] net/vmw_vsock: " Christoph Hellwig
2018-01-22 20:12 ` Christoph Hellwig [this message]
2018-01-22 20:12 ` [PATCH 25/36] net/sctp: " Christoph Hellwig
2018-01-22 20:12 ` [PATCH 26/36] net/bluetooth: " Christoph Hellwig
2018-01-22 20:12 ` [PATCH 27/36] net/caif: " Christoph Hellwig
2018-01-22 20:12 ` [PATCH 28/36] net/nfc: " Christoph Hellwig
2018-01-22 20:12 ` [PATCH 29/36] net/phonet: " Christoph Hellwig
2018-01-22 20:12 ` [PATCH 30/36] net/iucv: " Christoph Hellwig
2018-01-22 20:12 ` [PATCH 31/36] net/rxrpc: " Christoph Hellwig
2018-01-22 20:12 ` [PATCH 32/36] crypto: af_alg: " Christoph Hellwig
2018-01-22 20:12 ` [PATCH 33/36] pipe: " Christoph Hellwig
2018-01-22 20:12 ` [PATCH 34/36] eventfd: switch " Christoph Hellwig
2018-01-22 20:12 ` [PATCH 35/36] timerfd: convert " Christoph Hellwig
2018-01-22 20:12 ` [PATCH 36/36] random: " Christoph Hellwig
2018-01-25 20:10 ` aio poll, io_pgetevents and a new in-kernel poll API V4 Benjamin LaHaise
2018-01-26 12:31 ` Christoph Hellwig
-- strict thread matches above, loose matches on Subject: below --
2018-03-05 21:27 aio poll, io_pgetevents and a new in-kernel poll API V5 Christoph Hellwig
2018-03-05 21:27 ` [PATCH 24/36] net/tipc: convert to ->poll_mask Christoph Hellwig
2018-01-17 19:27 aio poll, io_pgetevents and a new in-kernel poll API V3 Christoph Hellwig
2018-01-17 19:27 ` [PATCH 24/36] net/tipc: convert to ->poll_mask 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=20180122201243.31610-25-hch@lst.de \
--to=hch@lst.de \
--cc=avi@scylladb.com \
--cc=linux-aio@kvack.org \
--cc=linux-api@vger.kernel.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).