linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 24/31] net/phonet: convert to ->poll_mask
Date: Tue, 22 May 2018 13:31:01 +0200	[thread overview]
Message-ID: <20180522113108.25713-25-hch@lst.de> (raw)
In-Reply-To: <20180522113108.25713-1-hch@lst.de>

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 net/phonet/socket.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/net/phonet/socket.c b/net/phonet/socket.c
index 9ecf02def928..ea2bfc3aafb9 100644
--- a/net/phonet/socket.c
+++ b/net/phonet/socket.c
@@ -340,15 +340,12 @@ static int pn_socket_getname(struct socket *sock, struct sockaddr *addr,
 	return sizeof(struct sockaddr_pn);
 }
 
-static __poll_t pn_socket_poll(struct file *file, struct socket *sock,
-					poll_table *wait)
+static __poll_t pn_socket_poll_mask(struct socket *sock, __poll_t events)
 {
 	struct sock *sk = sock->sk;
 	struct pep_sock *pn = pep_sk(sk);
 	__poll_t mask = 0;
 
-	poll_wait(file, sk_sleep(sk), wait);
-
 	if (sk->sk_state == TCP_CLOSE)
 		return EPOLLERR;
 	if (!skb_queue_empty(&sk->sk_receive_queue))
@@ -473,7 +470,7 @@ const struct proto_ops phonet_stream_ops = {
 	.socketpair	= sock_no_socketpair,
 	.accept		= pn_socket_accept,
 	.getname	= pn_socket_getname,
-	.poll		= pn_socket_poll,
+	.poll_mask	= pn_socket_poll_mask,
 	.ioctl		= pn_socket_ioctl,
 	.listen		= pn_socket_listen,
 	.shutdown	= sock_no_shutdown,
-- 
2.17.0

  parent reply	other threads:[~2018-05-22 11:32 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-22 11:30 aio poll and a new in-kernel poll API V12 Christoph Hellwig
2018-05-22 11:30 ` [PATCH 01/31] fs: unexport poll_schedule_timeout Christoph Hellwig
2018-05-22 11:30 ` [PATCH 02/31] fs: cleanup do_pollfd Christoph Hellwig
2018-05-22 11:30 ` [PATCH 03/31] fs: update documentation to mention __poll_t and match the code Christoph Hellwig
2018-05-22 11:30 ` [PATCH 04/31] fs: add new vfs_poll and file_can_poll helpers Christoph Hellwig
2018-05-22 11:30 ` [PATCH 05/31] fs: introduce new ->get_poll_head and ->poll_mask methods Christoph Hellwig
2018-05-22 11:30 ` [PATCH 06/31] aio: simplify KIOCB_KEY handling Christoph Hellwig
2018-05-22 11:30 ` [PATCH 07/31] aio: simplify cancellation Christoph Hellwig
2018-05-22 11:30 ` [PATCH 08/31] aio: implement IOCB_CMD_POLL Christoph Hellwig
2018-05-22 22:05   ` Al Viro
2018-05-23  0:45     ` Al Viro
2018-05-23  0:49       ` Al Viro
2018-05-23  1:43         ` YAaioRace (was Re: [PATCH 08/31] aio: implement IOCB_CMD_POLL) Al Viro
2018-05-22 11:30 ` [PATCH 09/31] aio: try to complete poll iocbs without context switch Christoph Hellwig
2018-05-22 11:30 ` [PATCH 10/31] net: refactor socket_poll Christoph Hellwig
2018-05-22 11:30 ` [PATCH 11/31] net: add support for ->poll_mask in proto_ops Christoph Hellwig
2018-05-22 11:30 ` [PATCH 12/31] net: remove sock_no_poll Christoph Hellwig
2018-05-22 11:30 ` [PATCH 13/31] net/tcp: convert to ->poll_mask Christoph Hellwig
2018-05-22 11:30 ` [PATCH 14/31] net/unix: " Christoph Hellwig
2018-05-22 11:30 ` [PATCH 15/31] net: convert datagram_poll users tp ->poll_mask Christoph Hellwig
2018-05-22 11:30 ` [PATCH 16/31] net/dccp: convert to ->poll_mask Christoph Hellwig
2018-05-22 11:30 ` [PATCH 17/31] net/atm: " Christoph Hellwig
2018-05-22 11:30 ` [PATCH 18/31] net/vmw_vsock: " Christoph Hellwig
2018-05-22 11:30 ` [PATCH 19/31] net/tipc: " Christoph Hellwig
2018-05-22 11:30 ` [PATCH 20/31] net/sctp: " Christoph Hellwig
2018-05-22 11:30 ` [PATCH 21/31] net/bluetooth: " Christoph Hellwig
2018-05-22 11:30 ` [PATCH 22/31] net/caif: " Christoph Hellwig
2018-05-22 11:31 ` [PATCH 23/31] net/nfc: " Christoph Hellwig
2018-05-22 11:31 ` Christoph Hellwig [this message]
2018-05-22 11:31 ` [PATCH 25/31] net/iucv: " Christoph Hellwig
2018-05-22 11:31 ` [PATCH 26/31] net/rxrpc: " Christoph Hellwig
2018-05-22 11:31 ` [PATCH 27/31] crypto: af_alg: " Christoph Hellwig
2018-05-22 11:31 ` [PATCH 28/31] pipe: " Christoph Hellwig
2018-05-22 11:31 ` [PATCH 29/31] eventfd: switch " Christoph Hellwig
2018-05-22 11:31 ` [PATCH 30/31] timerfd: convert " Christoph Hellwig
2018-05-22 16:59   ` Sergei Shtylyov
2018-05-22 11:31 ` [PATCH 31/31] random: " Christoph Hellwig
2018-05-22 22:07 ` aio poll and a new in-kernel poll API V12 Al Viro

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=20180522113108.25713-25-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 \
    --subject='Re: [PATCH 24/31] net/phonet: convert to ->poll_mask' \
    /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

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).