[25/36] net/sctp: convert to ->poll_mask

Message ID	20180122201243.31610-26-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 25/36] net/sctp: convert to ->poll_mask Date: Mon, 22 Jan 2018 21:12:32 +0100 Message-Id: <20180122201243.31610-26-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

Message ID

20180122201243.31610-26-hch@lst.de

State

Not Applicable, archived

Delegated to:

David Miller

Headers

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 25/36] net/sctp: convert to ->poll_mask
Date: Mon, 22 Jan 2018 21:12:32 +0100
Message-Id: <20180122201243.31610-26-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

Commit Message

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

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 608d123ef25f..e7637f40547f 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 3b18085e3b10..aa1261216b51 100644
--- a/net/sctp/ipv6.c
+++ b/net/sctp/ipv6.c
@@ -971,7 +971,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 6a38c2503649..13b7daafcca7 100644
--- a/net/sctp/protocol.c
+++ b/net/sctp/protocol.c
@@ -1026,7 +1026,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 03d9d24b38ba..34a97c0985ff 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -7500,14 +7500,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

[25/36] net/sctp: convert to ->poll_mask

Commit Message

Patch