[16/30] net/atm: convert to ->poll_mask

Message ID	20180329203328.3248-17-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 16/30] net/atm: convert to ->poll_mask Date: Thu, 29 Mar 2018 22:33:14 +0200 Message-Id: <20180329203328.3248-17-hch@lst.de> In-Reply-To: <20180329203328.3248-1-hch@lst.de> References: <20180329203328.3248-1-hch@lst.de> Sender: netdev-owner@vger.kernel.org Precedence: bulk
Series	[01/30] fs: unexport poll_schedule_timeout \| expand [01/30] fs: unexport poll_schedule_timeout [02/30] fs: cleanup do_pollfd [03/30] fs: update documentation to mention __poll_t and match the code [04/30] fs: add new vfs_poll and file_can_poll helpers [05/30] fs: introduce new ->get_poll_head and ->poll_mask methods [06/30] aio: simplify cancellation [07/30] aio: add delayed cancel support [08/30] aio: implement IOCB_CMD_POLL [09/30] net: refactor socket_poll [10/30] net: add support for ->poll_mask in proto_ops [11/30] net: remove sock_no_poll [12/30] net/tcp: convert to ->poll_mask [13/30] net/unix: convert to ->poll_mask [14/30] net: convert datagram_poll users tp ->poll_mask [15/30] net/dccp: convert to ->poll_mask [16/30] net/atm: convert to ->poll_mask [17/30] net/vmw_vsock: convert to ->poll_mask [18/30] net/tipc: convert to ->poll_mask [19/30] net/sctp: convert to ->poll_mask [20/30] net/bluetooth: convert to ->poll_mask [21/30] net/caif: convert to ->poll_mask [22/30] net/nfc: convert to ->poll_mask [23/30] net/phonet: convert to ->poll_mask [24/30] net/iucv: convert to ->poll_mask [25/30] net/rxrpc: convert to ->poll_mask [26/30] crypto: af_alg: convert to ->poll_mask [27/30] pipe: convert to ->poll_mask [28/30] eventfd: switch to ->poll_mask [29/30] timerfd: convert to ->poll_mask [30/30] random: convert to ->poll_mask

Message ID

20180329203328.3248-17-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 16/30] net/atm: convert to ->poll_mask
Date: Thu, 29 Mar 2018 22:33:14 +0200
Message-Id: <20180329203328.3248-17-hch@lst.de>
In-Reply-To: <20180329203328.3248-1-hch@lst.de>
References: <20180329203328.3248-1-hch@lst.de>
Sender: netdev-owner@vger.kernel.org
Precedence: bulk

Series

[01/30] fs: unexport poll_schedule_timeout | expand

Commit Message

Christoph Hellwig March 29, 2018, 8:33 p.m. UTC

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 net/atm/common.c | 11 +++--------
 net/atm/common.h |  2 +-
 net/atm/pvc.c    |  2 +-
 net/atm/svc.c    |  2 +-
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/net/atm/common.c b/net/atm/common.c
index fc78a0508ae1..1f2af59935db 100644
--- a/net/atm/common.c
+++ b/net/atm/common.c
@@ -648,16 +648,11 @@  int vcc_sendmsg(struct socket *sock, struct msghdr *m, size_t size)
 	return error;
 }
 
-__poll_t vcc_poll(struct file *file, struct socket *sock, poll_table *wait)
+__poll_t vcc_poll_mask(struct socket *sock, __poll_t events)
 {
 	struct sock *sk = sock->sk;
-	struct atm_vcc *vcc;
-	__poll_t mask;
-
-	sock_poll_wait(file, sk_sleep(sk), wait);
-	mask = 0;
-
-	vcc = ATM_SD(sock);
+	struct atm_vcc *vcc = ATM_SD(sock);
+	__poll_t mask = 0;
 
 	/* exceptional events */
 	if (sk->sk_err)
diff --git a/net/atm/common.h b/net/atm/common.h
index 5850649068bb..526796ad230f 100644
--- a/net/atm/common.h
+++ b/net/atm/common.h
@@ -17,7 +17,7 @@  int vcc_connect(struct socket *sock, int itf, short vpi, int vci);
 int vcc_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
 		int flags);
 int vcc_sendmsg(struct socket *sock, struct msghdr *m, size_t total_len);
-__poll_t vcc_poll(struct file *file, struct socket *sock, poll_table *wait);
+__poll_t vcc_poll_mask(struct socket *sock, __poll_t events);
 int vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);
 int vcc_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);
 int vcc_setsockopt(struct socket *sock, int level, int optname,
diff --git a/net/atm/pvc.c b/net/atm/pvc.c
index e1140b3bdcaa..930651c5e77c 100644
--- a/net/atm/pvc.c
+++ b/net/atm/pvc.c
@@ -114,7 +114,7 @@  static const struct proto_ops pvc_proto_ops = {
 	.socketpair =	sock_no_socketpair,
 	.accept =	sock_no_accept,
 	.getname =	pvc_getname,
-	.poll =		vcc_poll,
+	.poll_mask =	vcc_poll_mask,
 	.ioctl =	vcc_ioctl,
 #ifdef CONFIG_COMPAT
 	.compat_ioctl = vcc_compat_ioctl,
diff --git a/net/atm/svc.c b/net/atm/svc.c
index c458adcbc177..ad0e6ffb9cfe 100644
--- a/net/atm/svc.c
+++ b/net/atm/svc.c
@@ -637,7 +637,7 @@  static const struct proto_ops svc_proto_ops = {
 	.socketpair =	sock_no_socketpair,
 	.accept =	svc_accept,
 	.getname =	svc_getname,
-	.poll =		vcc_poll,
+	.poll_mask =	vcc_poll_mask,
 	.ioctl =	svc_ioctl,
 #ifdef CONFIG_COMPAT
 	.compat_ioctl =	svc_compat_ioctl,

[16/30] net/atm: convert to ->poll_mask

Commit Message

Patch