linux-kernel.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 19/30] net/sctp: convert to ->poll_mask
Date: Wed, 28 Mar 2018 09:29:15 +0200	[thread overview]
Message-ID: <20180328072926.17131-20-hch@lst.de> (raw)
In-Reply-To: <20180328072926.17131-1-hch@lst.de>

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 include/net/sctp/sctp.h | 3 +--
 net/sctp/ipv6.c         | 2 +-
 net/sctp/protocol.c     | 2 +-
 net/sctp/socket.c       | 4 +---
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
index f7ae6b0a21d0..37abd5ba4a3f 100644
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
@@ -107,8 +107,7 @@ int sctp_backlog_rcv(struct sock *sk, struct sk_buff *skb);
 int sctp_inet_listen(struct socket *sock, int backlog);
 void sctp_write_space(struct sock *sk);
 void sctp_data_ready(struct sock *sk);
-__poll_t sctp_poll(struct file *file, struct socket *sock,
-		poll_table *wait);
+__poll_t sctp_poll_mask(struct socket *sock, __poll_t events);
 void sctp_sock_rfree(struct sk_buff *skb);
 void sctp_copy_sock(struct sock *newsk, struct sock *sk,
 		    struct sctp_association *asoc);
diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
index e35d4f73d2df..6b0b8fc5b75a 100644
--- a/net/sctp/ipv6.c
+++ b/net/sctp/ipv6.c
@@ -976,7 +976,7 @@ static const struct proto_ops inet6_seqpacket_ops = {
 	.socketpair	   = sock_no_socketpair,
 	.accept		   = inet_accept,
 	.getname	   = sctp_getname,
-	.poll		   = sctp_poll,
+	.poll_mask	   = sctp_poll_mask,
 	.ioctl		   = inet6_ioctl,
 	.listen		   = sctp_inet_listen,
 	.shutdown	   = inet_shutdown,
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
index 91813e686c67..20c544890e80 100644
--- a/net/sctp/protocol.c
+++ b/net/sctp/protocol.c
@@ -1024,7 +1024,7 @@ static const struct proto_ops inet_seqpacket_ops = {
 	.socketpair	   = sock_no_socketpair,
 	.accept		   = inet_accept,
 	.getname	   = inet_getname,	/* Semantics are different.  */
-	.poll		   = sctp_poll,
+	.poll_mask	   = sctp_poll_mask,
 	.ioctl		   = inet_ioctl,
 	.listen		   = sctp_inet_listen,
 	.shutdown	   = inet_shutdown,	/* Looks harmless.  */
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index bf271f8c2dc9..097454740929 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -7587,14 +7587,12 @@ int sctp_inet_listen(struct socket *sock, int backlog)
  * here, again, by modeling the current TCP/UDP code.  We don't have
  * a good way to test with it yet.
  */
-__poll_t sctp_poll(struct file *file, struct socket *sock, poll_table *wait)
+__poll_t sctp_poll_mask(struct socket *sock, __poll_t events)
 {
 	struct sock *sk = sock->sk;
 	struct sctp_sock *sp = sctp_sk(sk);
 	__poll_t mask;
 
-	poll_wait(file, sk_sleep(sk), wait);
-
 	sock_rps_record_flow(sk);
 
 	/* A TCP-style listening socket becomes readable when the accept queue
-- 
2.14.2


  parent reply	other threads:[~2018-03-28  7:35 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-28  7:28 aio poll and a new in-kernel poll API V7 Christoph Hellwig
2018-03-28  7:28 ` [PATCH 01/30] fs: unexport poll_schedule_timeout Christoph Hellwig
2018-03-28  7:28 ` [PATCH 02/30] fs: cleanup do_pollfd Christoph Hellwig
2018-03-28  7:28 ` [PATCH 03/30] fs: update documentation to mention __poll_t and match the code Christoph Hellwig
2018-03-28  7:29 ` [PATCH 04/30] fs: add new vfs_poll and file_can_poll helpers Christoph Hellwig
2018-03-28  7:29 ` [PATCH 05/30] fs: introduce new ->get_poll_head and ->poll_mask methods Christoph Hellwig
2018-03-28  7:29 ` [PATCH 06/30] aio: simplify cancellation Christoph Hellwig
2018-03-28  7:29 ` [PATCH 07/30] aio: add delayed cancel support Christoph Hellwig
2018-03-28 16:35   ` Al Viro
2018-03-28 21:34     ` Al Viro
2018-03-29  8:53     ` Christoph Hellwig
2018-03-29 14:25       ` Al Viro
2018-03-29 18:08         ` Christoph Hellwig
2018-03-28  7:29 ` [PATCH 08/30] aio: implement IOCB_CMD_POLL Christoph Hellwig
2018-03-28  7:29 ` [PATCH 09/30] net: refactor socket_poll Christoph Hellwig
2018-03-28  7:29 ` [PATCH 10/30] net: add support for ->poll_mask in proto_ops Christoph Hellwig
2018-03-28  7:29 ` [PATCH 11/30] net: remove sock_no_poll Christoph Hellwig
2018-03-28  7:29 ` [PATCH 12/30] net/tcp: convert to ->poll_mask Christoph Hellwig
2018-03-28  7:29 ` [PATCH 13/30] net/unix: " Christoph Hellwig
2018-03-28  7:29 ` [PATCH 14/30] net: convert datagram_poll users tp ->poll_mask Christoph Hellwig
2018-03-28  7:29 ` [PATCH 15/30] net/dccp: convert to ->poll_mask Christoph Hellwig
2018-03-28  7:29 ` [PATCH 16/30] net/atm: " Christoph Hellwig
2018-03-28  7:29 ` [PATCH 17/30] net/vmw_vsock: " Christoph Hellwig
2018-03-28  7:29 ` [PATCH 18/30] net/tipc: " Christoph Hellwig
2018-03-28  7:29 ` Christoph Hellwig [this message]
2018-03-28  7:29 ` [PATCH 20/30] net/bluetooth: " Christoph Hellwig
2018-03-28  7:29 ` [PATCH 21/30] net/caif: " Christoph Hellwig
2018-03-28  7:29 ` [PATCH 22/30] net/nfc: " Christoph Hellwig
2018-03-28  7:29 ` [PATCH 23/30] net/phonet: " Christoph Hellwig
2018-03-28  7:29 ` [PATCH 24/30] net/iucv: " Christoph Hellwig
2018-03-28  7:29 ` [PATCH 25/30] net/rxrpc: " Christoph Hellwig
2018-03-28  7:29 ` [PATCH 26/30] crypto: af_alg: " Christoph Hellwig
2018-03-28  7:29 ` [PATCH 27/30] pipe: " Christoph Hellwig
2018-03-28  7:29 ` [PATCH 28/30] eventfd: switch " Christoph Hellwig
2018-03-28  7:29 ` [PATCH 29/30] timerfd: convert " Christoph Hellwig
2018-03-28  7:29 ` [PATCH 30/30] random: " Christoph Hellwig
2018-03-29 20:32 aio poll and a new in-kernel poll API V8 Christoph Hellwig
2018-03-29 20:33 ` [PATCH 19/30] net/sctp: 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=20180328072926.17131-20-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).