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 [thread overview]
Message-ID: <20180329203328.3248-17-hch@lst.de> (raw)
In-Reply-To: <20180329203328.3248-1-hch@lst.de>
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,
--
2.14.2
next prev parent reply other threads:[~2018-03-29 20:34 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-29 20:32 aio poll and a new in-kernel poll API V8 Christoph Hellwig
2018-03-29 20:32 ` [PATCH 01/30] fs: unexport poll_schedule_timeout Christoph Hellwig
2018-03-29 20:33 ` [PATCH 02/30] fs: cleanup do_pollfd Christoph Hellwig
2018-03-29 20:33 ` [PATCH 03/30] fs: update documentation to mention __poll_t and match the code Christoph Hellwig
2018-03-29 20:33 ` [PATCH 04/30] fs: add new vfs_poll and file_can_poll helpers Christoph Hellwig
2018-03-29 20:33 ` [PATCH 05/30] fs: introduce new ->get_poll_head and ->poll_mask methods Christoph Hellwig
2018-03-29 20:33 ` [PATCH 06/30] aio: simplify cancellation Christoph Hellwig
2018-03-29 20:33 ` [PATCH 07/30] aio: add delayed cancel support Christoph Hellwig
2018-03-29 22:35 ` Al Viro
2018-03-30 7:14 ` Christoph Hellwig
2018-03-29 20:33 ` [PATCH 08/30] aio: implement IOCB_CMD_POLL Christoph Hellwig
2018-03-29 20:33 ` [PATCH 09/30] net: refactor socket_poll Christoph Hellwig
2018-03-29 20:33 ` [PATCH 10/30] net: add support for ->poll_mask in proto_ops Christoph Hellwig
2018-03-29 20:33 ` [PATCH 11/30] net: remove sock_no_poll Christoph Hellwig
2018-03-29 20:33 ` [PATCH 12/30] net/tcp: convert to ->poll_mask Christoph Hellwig
2018-03-29 20:33 ` [PATCH 13/30] net/unix: " Christoph Hellwig
2018-03-29 20:33 ` [PATCH 14/30] net: convert datagram_poll users tp ->poll_mask Christoph Hellwig
2018-03-29 20:33 ` [PATCH 15/30] net/dccp: convert to ->poll_mask Christoph Hellwig
2018-03-29 20:33 ` Christoph Hellwig [this message]
2018-03-29 20:33 ` [PATCH 17/30] net/vmw_vsock: " Christoph Hellwig
2018-03-29 20:33 ` [PATCH 18/30] net/tipc: " Christoph Hellwig
2018-03-29 20:33 ` [PATCH 19/30] net/sctp: " Christoph Hellwig
2018-03-29 20:33 ` [PATCH 20/30] net/bluetooth: " Christoph Hellwig
2018-03-29 20:33 ` [PATCH 21/30] net/caif: " Christoph Hellwig
2018-03-29 20:33 ` [PATCH 22/30] net/nfc: " Christoph Hellwig
2018-03-29 20:33 ` [PATCH 23/30] net/phonet: " Christoph Hellwig
2018-03-29 20:33 ` [PATCH 24/30] net/iucv: " Christoph Hellwig
2018-03-29 20:33 ` [PATCH 25/30] net/rxrpc: " Christoph Hellwig
2018-03-29 20:33 ` [PATCH 26/30] crypto: af_alg: " Christoph Hellwig
2018-03-29 20:33 ` [PATCH 27/30] pipe: " Christoph Hellwig
2018-03-29 20:33 ` [PATCH 28/30] eventfd: switch " Christoph Hellwig
2018-03-29 20:33 ` [PATCH 29/30] timerfd: convert " Christoph Hellwig
2018-03-29 20:33 ` [PATCH 30/30] random: " Christoph Hellwig
-- strict thread matches above, loose matches on Subject: below --
2018-03-28 7:28 aio poll and a new in-kernel poll API V7 Christoph Hellwig
2018-03-28 7:29 ` [PATCH 16/30] net/atm: 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=20180329203328.3248-17-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).