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/28] net/caif: convert to ->poll_mask
Date: Wed, 21 Mar 2018 08:40:23 +0100 [thread overview]
Message-ID: <20180321074032.14211-20-hch@lst.de> (raw)
In-Reply-To: <20180321074032.14211-1-hch@lst.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
net/caif/caif_socket.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c
index a6fb1b3bcad9..c7991867d622 100644
--- a/net/caif/caif_socket.c
+++ b/net/caif/caif_socket.c
@@ -934,15 +934,11 @@ static int caif_release(struct socket *sock)
}
/* Copied from af_unix.c:unix_poll(), added CAIF tx_flow handling */
-static __poll_t caif_poll(struct file *file,
- struct socket *sock, poll_table *wait)
+static __poll_t caif_poll_mask(struct socket *sock, __poll_t events)
{
struct sock *sk = sock->sk;
- __poll_t mask;
struct caifsock *cf_sk = container_of(sk, struct caifsock, sk);
-
- sock_poll_wait(file, sk_sleep(sk), wait);
- mask = 0;
+ __poll_t mask = 0;
/* exceptional events? */
if (sk->sk_err)
@@ -976,7 +972,7 @@ static const struct proto_ops caif_seqpacket_ops = {
.socketpair = sock_no_socketpair,
.accept = sock_no_accept,
.getname = sock_no_getname,
- .poll = caif_poll,
+ .poll_mask = caif_poll_mask,
.ioctl = sock_no_ioctl,
.listen = sock_no_listen,
.shutdown = sock_no_shutdown,
@@ -997,7 +993,7 @@ static const struct proto_ops caif_stream_ops = {
.socketpair = sock_no_socketpair,
.accept = sock_no_accept,
.getname = sock_no_getname,
- .poll = caif_poll,
+ .poll_mask = caif_poll_mask,
.ioctl = sock_no_ioctl,
.listen = sock_no_listen,
.shutdown = sock_no_shutdown,
--
2.14.2
WARNING: multiple messages have this Message-ID (diff)
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/28] net/caif: convert to ->poll_mask
Date: Wed, 21 Mar 2018 08:40:23 +0100 [thread overview]
Message-ID: <20180321074032.14211-20-hch@lst.de> (raw)
In-Reply-To: <20180321074032.14211-1-hch@lst.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
net/caif/caif_socket.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c
index a6fb1b3bcad9..c7991867d622 100644
--- a/net/caif/caif_socket.c
+++ b/net/caif/caif_socket.c
@@ -934,15 +934,11 @@ static int caif_release(struct socket *sock)
}
/* Copied from af_unix.c:unix_poll(), added CAIF tx_flow handling */
-static __poll_t caif_poll(struct file *file,
- struct socket *sock, poll_table *wait)
+static __poll_t caif_poll_mask(struct socket *sock, __poll_t events)
{
struct sock *sk = sock->sk;
- __poll_t mask;
struct caifsock *cf_sk = container_of(sk, struct caifsock, sk);
-
- sock_poll_wait(file, sk_sleep(sk), wait);
- mask = 0;
+ __poll_t mask = 0;
/* exceptional events? */
if (sk->sk_err)
@@ -976,7 +972,7 @@ static const struct proto_ops caif_seqpacket_ops = {
.socketpair = sock_no_socketpair,
.accept = sock_no_accept,
.getname = sock_no_getname,
- .poll = caif_poll,
+ .poll_mask = caif_poll_mask,
.ioctl = sock_no_ioctl,
.listen = sock_no_listen,
.shutdown = sock_no_shutdown,
@@ -997,7 +993,7 @@ static const struct proto_ops caif_stream_ops = {
.socketpair = sock_no_socketpair,
.accept = sock_no_accept,
.getname = sock_no_getname,
- .poll = caif_poll,
+ .poll_mask = caif_poll_mask,
.ioctl = sock_no_ioctl,
.listen = sock_no_listen,
.shutdown = sock_no_shutdown,
--
2.14.2
--
To unsubscribe, send a message with 'unsubscribe linux-aio' in
the body to majordomo@kvack.org. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"aart@kvack.org">aart@kvack.org</a>
next prev parent reply other threads:[~2018-03-21 7:45 UTC|newest]
Thread overview: 90+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-21 7:40 aio poll and a new in-kernel poll API V6 Christoph Hellwig
2018-03-21 7:40 ` Christoph Hellwig
2018-03-21 7:40 ` [PATCH 01/28] fs: unexport poll_schedule_timeout Christoph Hellwig
2018-03-21 7:40 ` Christoph Hellwig
2018-03-21 9:05 ` Greg KH
2018-03-21 9:05 ` Greg KH
2018-03-21 7:40 ` [PATCH 02/28] fs: cleanup do_pollfd Christoph Hellwig
2018-03-21 7:40 ` Christoph Hellwig
2018-03-21 9:06 ` Greg KH
2018-03-21 9:06 ` Greg KH
2018-03-21 7:40 ` [PATCH 03/28] fs: update documentation to mention __poll_t Christoph Hellwig
2018-03-21 7:40 ` Christoph Hellwig
2018-03-21 9:06 ` Greg KH
2018-03-21 9:06 ` Greg KH
2018-03-21 16:28 ` Darrick J. Wong
2018-03-21 16:28 ` Darrick J. Wong
2018-03-21 7:40 ` [PATCH 04/28] fs: add new vfs_poll and file_can_poll helpers Christoph Hellwig
2018-03-21 7:40 ` Christoph Hellwig
2018-03-21 9:07 ` Greg KH
2018-03-21 9:07 ` Greg KH
2018-03-21 7:40 ` [PATCH 05/28] fs: introduce new ->get_poll_head and ->poll_mask methods Christoph Hellwig
2018-03-21 7:40 ` Christoph Hellwig
2018-03-21 9:08 ` Greg KH
2018-03-21 9:08 ` Greg KH
2018-03-21 16:29 ` Darrick J. Wong
2018-03-21 16:29 ` Darrick J. Wong
2018-03-21 7:40 ` [PATCH 06/28] aio: implement IOCB_CMD_POLL Christoph Hellwig
2018-03-21 7:40 ` Christoph Hellwig
2018-03-21 9:09 ` Greg KH
2018-03-21 9:09 ` Greg KH
2018-03-21 16:31 ` Darrick J. Wong
2018-03-21 16:31 ` Darrick J. Wong
2018-03-22 16:52 ` Al Viro
2018-03-22 16:52 ` Al Viro
2018-03-22 17:24 ` Christoph Hellwig
2018-03-22 17:24 ` Christoph Hellwig
2018-03-22 18:16 ` Al Viro
2018-03-22 18:16 ` Al Viro
2018-03-23 18:05 ` Christoph Hellwig
2018-03-23 18:05 ` Christoph Hellwig
2018-03-21 7:40 ` [PATCH 07/28] net: refactor socket_poll Christoph Hellwig
2018-03-21 7:40 ` Christoph Hellwig
2018-03-21 7:40 ` [PATCH 08/28] net: add support for ->poll_mask in proto_ops Christoph Hellwig
2018-03-21 7:40 ` Christoph Hellwig
2018-03-21 7:40 ` [PATCH 09/28] net: remove sock_no_poll Christoph Hellwig
2018-03-21 7:40 ` Christoph Hellwig
2018-03-21 7:40 ` [PATCH 10/28] net/tcp: convert to ->poll_mask Christoph Hellwig
2018-03-21 7:40 ` Christoph Hellwig
2018-03-21 7:40 ` [PATCH 11/28] net/unix: " Christoph Hellwig
2018-03-21 7:40 ` Christoph Hellwig
2018-03-21 7:40 ` [PATCH 12/28] net: convert datagram_poll users tp ->poll_mask Christoph Hellwig
2018-03-21 7:40 ` Christoph Hellwig
2018-03-21 9:11 ` Greg KH
2018-03-21 9:11 ` Greg KH
2018-03-21 7:40 ` [PATCH 13/28] net/dccp: convert to ->poll_mask Christoph Hellwig
2018-03-21 7:40 ` Christoph Hellwig
2018-03-21 7:40 ` [PATCH 14/28] net/atm: " Christoph Hellwig
2018-03-21 7:40 ` Christoph Hellwig
2018-03-21 7:40 ` [PATCH 15/28] net/vmw_vsock: " Christoph Hellwig
2018-03-21 7:40 ` Christoph Hellwig
2018-03-21 7:40 ` [PATCH 16/28] net/tipc: " Christoph Hellwig
2018-03-21 7:40 ` Christoph Hellwig
2018-03-21 7:40 ` [PATCH 17/28] net/sctp: " Christoph Hellwig
2018-03-21 7:40 ` Christoph Hellwig
2018-03-21 7:40 ` [PATCH 18/28] net/bluetooth: " Christoph Hellwig
2018-03-21 7:40 ` Christoph Hellwig
2018-03-21 7:40 ` Christoph Hellwig [this message]
2018-03-21 7:40 ` [PATCH 19/28] net/caif: " Christoph Hellwig
2018-03-21 7:40 ` [PATCH 20/28] net/nfc: " Christoph Hellwig
2018-03-21 7:40 ` Christoph Hellwig
2018-03-21 7:40 ` [PATCH 21/28] net/phonet: " Christoph Hellwig
2018-03-21 7:40 ` Christoph Hellwig
2018-03-21 7:40 ` [PATCH 22/28] net/iucv: " Christoph Hellwig
2018-03-21 7:40 ` Christoph Hellwig
2018-03-21 7:40 ` [PATCH 23/28] net/rxrpc: " Christoph Hellwig
2018-03-21 7:40 ` Christoph Hellwig
2018-03-21 7:40 ` [PATCH 24/28] crypto: af_alg: " Christoph Hellwig
2018-03-21 7:40 ` Christoph Hellwig
2018-03-21 7:40 ` [PATCH 25/28] pipe: " Christoph Hellwig
2018-03-21 7:40 ` Christoph Hellwig
2018-03-21 7:40 ` [PATCH 26/28] eventfd: switch " Christoph Hellwig
2018-03-21 7:40 ` Christoph Hellwig
2018-03-21 7:40 ` [PATCH 27/28] timerfd: convert " Christoph Hellwig
2018-03-21 7:40 ` Christoph Hellwig
2018-03-21 7:40 ` [PATCH 28/28] random: " Christoph Hellwig
2018-03-21 7:40 ` Christoph Hellwig
2018-03-21 9:10 ` Greg KH
2018-03-21 9:10 ` Greg KH
2018-03-22 13:49 ` Theodore Y. Ts'o
2018-03-22 13:49 ` Theodore Y. Ts'o
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=20180321074032.14211-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.