[25/33] net/nfc: convert to ->poll_mask

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

Message ID

20180523192022.1703-26-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 25/33] net/nfc: convert to ->poll_mask
Date: Wed, 23 May 2018 21:20:14 +0200
Message-Id: <20180523192022.1703-26-hch@lst.de>
In-Reply-To: <20180523192022.1703-1-hch@lst.de>
References: <20180523192022.1703-1-hch@lst.de>
Sender: netdev-owner@vger.kernel.org
Precedence: bulk

Series

[01/33] fix io_destroy()/aio_complete() race | expand

Commit Message

Christoph Hellwig May 23, 2018, 7:20 p.m. UTC

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 net/nfc/llcp_sock.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/net/nfc/llcp_sock.c b/net/nfc/llcp_sock.c
index ea0c0c6f1874..ab5bb14b49af 100644
--- a/net/nfc/llcp_sock.c
+++ b/net/nfc/llcp_sock.c
@@ -548,16 +548,13 @@  static inline __poll_t llcp_accept_poll(struct sock *parent)
 	return 0;
 }
 
-static __poll_t llcp_sock_poll(struct file *file, struct socket *sock,
-				   poll_table *wait)
+static __poll_t llcp_sock_poll_mask(struct socket *sock, __poll_t events)
 {
 	struct sock *sk = sock->sk;
 	__poll_t mask = 0;
 
 	pr_debug("%p\n", sk);
 
-	sock_poll_wait(file, sk_sleep(sk), wait);
-
 	if (sk->sk_state == LLCP_LISTEN)
 		return llcp_accept_poll(sk);
 
@@ -899,7 +896,7 @@  static const struct proto_ops llcp_sock_ops = {
 	.socketpair     = sock_no_socketpair,
 	.accept         = llcp_sock_accept,
 	.getname        = llcp_sock_getname,
-	.poll           = llcp_sock_poll,
+	.poll_mask      = llcp_sock_poll_mask,
 	.ioctl          = sock_no_ioctl,
 	.listen         = llcp_sock_listen,
 	.shutdown       = sock_no_shutdown,
@@ -919,7 +916,7 @@  static const struct proto_ops llcp_rawsock_ops = {
 	.socketpair     = sock_no_socketpair,
 	.accept         = sock_no_accept,
 	.getname        = llcp_sock_getname,
-	.poll           = llcp_sock_poll,
+	.poll_mask      = llcp_sock_poll_mask,
 	.ioctl          = sock_no_ioctl,
 	.listen         = sock_no_listen,
 	.shutdown       = sock_no_shutdown,

[25/33] net/nfc: convert to ->poll_mask

Commit Message

Patch