linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 26/32] net/iucv: convert to ->poll_mask
Date: Fri, 11 May 2018 13:07:57 +0200	[thread overview]
Message-ID: <20180511110803.10910-27-hch@lst.de> (raw)
In-Reply-To: <20180511110803.10910-1-hch@lst.de>

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 include/net/iucv/af_iucv.h | 2 --
 net/iucv/af_iucv.c         | 7 ++-----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h
index f4c21b5a1242..b0eaeb02d46d 100644
--- a/include/net/iucv/af_iucv.h
+++ b/include/net/iucv/af_iucv.h
@@ -153,8 +153,6 @@ struct iucv_sock_list {
 	atomic_t	  autobind_name;
 };
 
-__poll_t iucv_sock_poll(struct file *file, struct socket *sock,
-			    poll_table *wait);
 void iucv_sock_link(struct iucv_sock_list *l, struct sock *s);
 void iucv_sock_unlink(struct iucv_sock_list *l, struct sock *s);
 void iucv_accept_enqueue(struct sock *parent, struct sock *sk);
diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
index 893a022f9620..68e86257a549 100644
--- a/net/iucv/af_iucv.c
+++ b/net/iucv/af_iucv.c
@@ -1488,14 +1488,11 @@ static inline __poll_t iucv_accept_poll(struct sock *parent)
 	return 0;
 }
 
-__poll_t iucv_sock_poll(struct file *file, struct socket *sock,
-			    poll_table *wait)
+static __poll_t iucv_sock_poll_mask(struct socket *sock, __poll_t events)
 {
 	struct sock *sk = sock->sk;
 	__poll_t mask = 0;
 
-	sock_poll_wait(file, sk_sleep(sk), wait);
-
 	if (sk->sk_state == IUCV_LISTEN)
 		return iucv_accept_poll(sk);
 
@@ -2388,7 +2385,7 @@ static const struct proto_ops iucv_sock_ops = {
 	.getname	= iucv_sock_getname,
 	.sendmsg	= iucv_sock_sendmsg,
 	.recvmsg	= iucv_sock_recvmsg,
-	.poll		= iucv_sock_poll,
+	.poll_mask	= iucv_sock_poll_mask,
 	.ioctl		= sock_no_ioctl,
 	.mmap		= sock_no_mmap,
 	.socketpair	= sock_no_socketpair,
-- 
2.17.0

  parent reply	other threads:[~2018-05-11 11:07 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-11 11:07 aio poll and a new in-kernel poll API V10 Christoph Hellwig
2018-05-11 11:07 ` [PATCH 01/32] fs: unexport poll_schedule_timeout Christoph Hellwig
2018-05-11 11:07 ` [PATCH 02/32] fs: cleanup do_pollfd Christoph Hellwig
2018-05-11 11:07 ` [PATCH 03/32] fs: update documentation to mention __poll_t and match the code Christoph Hellwig
2018-05-11 11:07 ` [PATCH 04/32] fs: add new vfs_poll and file_can_poll helpers Christoph Hellwig
2018-05-11 11:07 ` [PATCH 05/32] fs: introduce new ->get_poll_head and ->poll_mask methods Christoph Hellwig
2018-05-11 11:07 ` [PATCH 06/32] aio: simplify KIOCB_KEY handling Christoph Hellwig
2018-05-11 11:07 ` [PATCH 07/32] aio: simplify cancellation Christoph Hellwig
2018-05-11 11:07 ` [PATCH 08/32] aio: replace kiocb_set_cancel_fn with a cancel_kiocb file operation Christoph Hellwig
2018-05-11 11:07 ` [PATCH 09/32] aio: add delayed cancel support Christoph Hellwig
2018-05-11 11:07 ` [PATCH 10/32] aio: implement IOCB_CMD_POLL Christoph Hellwig
2018-05-11 11:07 ` [PATCH 11/32] net: refactor socket_poll Christoph Hellwig
2018-05-11 11:07 ` [PATCH 12/32] net: add support for ->poll_mask in proto_ops Christoph Hellwig
2018-05-11 11:07 ` [PATCH 13/32] net: remove sock_no_poll Christoph Hellwig
2018-05-11 11:07 ` [PATCH 14/32] net/tcp: convert to ->poll_mask Christoph Hellwig
2018-05-11 13:13   ` Eric Dumazet
2018-05-12 10:09     ` Christoph Hellwig
2018-05-11 11:07 ` [PATCH 15/32] net/unix: " Christoph Hellwig
2018-05-11 11:07 ` [PATCH 16/32] net: convert datagram_poll users tp ->poll_mask Christoph Hellwig
2018-05-11 11:07 ` [PATCH 17/32] net/dccp: convert to ->poll_mask Christoph Hellwig
2018-05-11 11:07 ` [PATCH 18/32] net/atm: " Christoph Hellwig
2018-05-11 11:07 ` [PATCH 19/32] net/vmw_vsock: " Christoph Hellwig
2018-05-11 11:07 ` [PATCH 20/32] net/tipc: " Christoph Hellwig
2018-05-11 11:07 ` [PATCH 21/32] net/sctp: " Christoph Hellwig
2018-05-11 11:07 ` [PATCH 22/32] net/bluetooth: " Christoph Hellwig
2018-05-11 11:07 ` [PATCH 23/32] net/caif: " Christoph Hellwig
2018-05-11 11:07 ` [PATCH 24/32] net/nfc: " Christoph Hellwig
2018-05-11 11:07 ` [PATCH 25/32] net/phonet: " Christoph Hellwig
2018-05-11 11:07 ` Christoph Hellwig [this message]
2018-05-11 11:07 ` [PATCH 27/32] net/rxrpc: " Christoph Hellwig
2018-05-11 11:07 ` [PATCH 28/32] crypto: af_alg: " Christoph Hellwig
2018-05-11 11:08 ` [PATCH 29/32] pipe: " Christoph Hellwig
2018-05-11 11:08 ` [PATCH 30/32] eventfd: switch " Christoph Hellwig
2018-05-11 11:08 ` [PATCH 31/32] timerfd: convert " Christoph Hellwig
2018-05-11 11:08 ` [PATCH 32/32] random: " Christoph Hellwig
  -- strict thread matches above, loose matches on Subject: below --
2018-05-15 19:48 aio poll and a new in-kernel poll API V11 Christoph Hellwig
2018-05-15 19:48 ` [PATCH 26/32] net/iucv: convert to ->poll_mask Christoph Hellwig
2018-03-30 15:07 aio poll and a new in-kernel poll API V9 Christoph Hellwig
2018-03-30 15:08 ` [PATCH 26/32] net/iucv: 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=20180511110803.10910-27-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).