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 13/30] net/unix: convert to ->poll_mask
Date: Wed, 28 Mar 2018 09:29:09 +0200 [thread overview]
Message-ID: <20180328072926.17131-14-hch@lst.de> (raw)
In-Reply-To: <20180328072926.17131-1-hch@lst.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
net/unix/af_unix.c | 30 +++++++++++-------------------
1 file changed, 11 insertions(+), 19 deletions(-)
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 2d465bdeccbc..619c6921dd46 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -638,9 +638,8 @@ static int unix_stream_connect(struct socket *, struct sockaddr *,
static int unix_socketpair(struct socket *, struct socket *);
static int unix_accept(struct socket *, struct socket *, int, bool);
static int unix_getname(struct socket *, struct sockaddr *, int *, int);
-static __poll_t unix_poll(struct file *, struct socket *, poll_table *);
-static __poll_t unix_dgram_poll(struct file *, struct socket *,
- poll_table *);
+static __poll_t unix_poll_mask(struct socket *, __poll_t);
+static __poll_t unix_dgram_poll_mask(struct socket *, __poll_t);
static int unix_ioctl(struct socket *, unsigned int, unsigned long);
static int unix_shutdown(struct socket *, int);
static int unix_stream_sendmsg(struct socket *, struct msghdr *, size_t);
@@ -681,7 +680,7 @@ static const struct proto_ops unix_stream_ops = {
.socketpair = unix_socketpair,
.accept = unix_accept,
.getname = unix_getname,
- .poll = unix_poll,
+ .poll_mask = unix_poll_mask,
.ioctl = unix_ioctl,
.listen = unix_listen,
.shutdown = unix_shutdown,
@@ -704,7 +703,7 @@ static const struct proto_ops unix_dgram_ops = {
.socketpair = unix_socketpair,
.accept = sock_no_accept,
.getname = unix_getname,
- .poll = unix_dgram_poll,
+ .poll_mask = unix_dgram_poll_mask,
.ioctl = unix_ioctl,
.listen = sock_no_listen,
.shutdown = unix_shutdown,
@@ -726,7 +725,7 @@ static const struct proto_ops unix_seqpacket_ops = {
.socketpair = unix_socketpair,
.accept = unix_accept,
.getname = unix_getname,
- .poll = unix_dgram_poll,
+ .poll_mask = unix_dgram_poll_mask,
.ioctl = unix_ioctl,
.listen = unix_listen,
.shutdown = unix_shutdown,
@@ -2640,13 +2639,10 @@ static int unix_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
return err;
}
-static __poll_t unix_poll(struct file *file, struct socket *sock, poll_table *wait)
+static __poll_t unix_poll_mask(struct socket *sock, __poll_t events)
{
struct sock *sk = sock->sk;
- __poll_t mask;
-
- sock_poll_wait(file, sk_sleep(sk), wait);
- mask = 0;
+ __poll_t mask = 0;
/* exceptional events? */
if (sk->sk_err)
@@ -2675,15 +2671,11 @@ static __poll_t unix_poll(struct file *file, struct socket *sock, poll_table *wa
return mask;
}
-static __poll_t unix_dgram_poll(struct file *file, struct socket *sock,
- poll_table *wait)
+static __poll_t unix_dgram_poll_mask(struct socket *sock, __poll_t events)
{
struct sock *sk = sock->sk, *other;
- unsigned int writable;
- __poll_t mask;
-
- sock_poll_wait(file, sk_sleep(sk), wait);
- mask = 0;
+ int writable;
+ __poll_t mask = 0;
/* exceptional events? */
if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue))
@@ -2709,7 +2701,7 @@ static __poll_t unix_dgram_poll(struct file *file, struct socket *sock,
}
/* No write status requested, avoid expensive OUT tests. */
- if (!(poll_requested_events(wait) & (EPOLLWRBAND|EPOLLWRNORM|EPOLLOUT)))
+ if (!(events & (EPOLLWRBAND|EPOLLWRNORM|EPOLLOUT)))
return mask;
writable = unix_writable(sk);
--
2.14.2
next prev parent reply other threads:[~2018-03-28 7:30 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 ` Christoph Hellwig [this message]
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 ` [PATCH 19/30] net/sctp: " Christoph Hellwig
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 13/30] net/unix: 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-14-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).