[28/31] pipe: convert to ->poll_mask

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

Message ID

20180522113108.25713-29-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 28/31] pipe: convert to ->poll_mask
Date: Tue, 22 May 2018 13:31:05 +0200
Message-Id: <20180522113108.25713-29-hch@lst.de>
In-Reply-To: <20180522113108.25713-1-hch@lst.de>
References: <20180522113108.25713-1-hch@lst.de>
Sender: netdev-owner@vger.kernel.org
Precedence: bulk

Series

[01/31] fs: unexport poll_schedule_timeout | expand

Commit Message

Christoph Hellwig May 22, 2018, 11:31 a.m. UTC

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 fs/pipe.c | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/fs/pipe.c b/fs/pipe.c
index 39d6f431da83..bb0840e234f3 100644
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -509,19 +509,22 @@  static long pipe_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 	}
 }
 
-/* No kernel lock held - fine */
-static __poll_t
-pipe_poll(struct file *filp, poll_table *wait)
+static struct wait_queue_head *
+pipe_get_poll_head(struct file *filp, __poll_t events)
 {
-	__poll_t mask;
 	struct pipe_inode_info *pipe = filp->private_data;
-	int nrbufs;
 
-	poll_wait(filp, &pipe->wait, wait);
+	return &pipe->wait;
+}
+
+/* No kernel lock held - fine */
+static __poll_t pipe_poll_mask(struct file *filp, __poll_t events)
+{
+	struct pipe_inode_info *pipe = filp->private_data;
+	int nrbufs = pipe->nrbufs;
+	__poll_t mask = 0;
 
 	/* Reading only -- no need for acquiring the semaphore.  */
-	nrbufs = pipe->nrbufs;
-	mask = 0;
 	if (filp->f_mode & FMODE_READ) {
 		mask = (nrbufs > 0) ? EPOLLIN | EPOLLRDNORM : 0;
 		if (!pipe->writers && filp->f_version != pipe->w_counter)
@@ -1020,7 +1023,8 @@  const struct file_operations pipefifo_fops = {
 	.llseek		= no_llseek,
 	.read_iter	= pipe_read,
 	.write_iter	= pipe_write,
-	.poll		= pipe_poll,
+	.get_poll_head	= pipe_get_poll_head,
+	.poll_mask	= pipe_poll_mask,
 	.unlocked_ioctl	= pipe_ioctl,
 	.release	= pipe_release,
 	.fasync		= pipe_fasync,

[28/31] pipe: convert to ->poll_mask

Commit Message

Patch