From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-3779118-1522424674-2-10198515011011695441 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.249, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES unknown, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='CN', FromHeader='de', MailFrom='org' X-Spam-charsets: X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: linux-api-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=fm2; t= 1522424674; b=bM0elgPO79thmmgc3AwvRv7/VwxibwF6P/d2X6Q1njQeGVvFGT qJYKpmPUKrLKdwGTb4OIQS8+EQGO8s4rL/da1T/+kM/I+z8Co9vLDfhBGjykRqs2 rxllYqQjGqItrZckOt3scOptlQ59gCMT+ZjCwxfdgJUsNi2l0zbzzkX5YnlAXCLX tTeVhFLCThjMNH2gG8d1xyo8BNyvKXuqHLRpLi5ybXzbCRieLl2eS0g0ZfYkBq0V +iFY/EeBMM1kyVI+5ztcafTbMX23QUo3HpVO3mLi8TdVh6RTOfnoQlQMNG0zGm43 q52oV2CNNDqyzuc/2w5uzgyq/JxEUXGH/8Og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:sender:list-id; s=fm2; t=1522424674; bh= fWCLq16GNBjwDaSIqAACJDC6F2S+jYWRtJKqSXFhZjw=; b=oAf1aRs1yW+QUEYK /PIaJYxK85fZEZzzHpdoKQmxCDIFyb/Hiv+vYfbertcG8WCwy7vZIz3PQk7GmA2A BDdCmIBPNycwkJusG02arON5f1jdQDbEOlA/7UIEFUjMbU/YEee5my4tkUJYHJpH k01jtv3w3XYO2tDNuXeS75VkkUNJv7Ex3c5QyL5GTrw8akngDgkX5Iuf3+XMrrWW yKWwm/ikc63ei7JTScS2BjYInvC6QvW1CXnpwPw3ixaOf+i/rtF5pYdu/pm2DwQn FvTCVVu08RvT2JBKVC/2eLyxFaWbLhRIsM93h0lpArRGCMNRbLDJsEBZC+RY9Kr/ s4p4DQ== ARC-Authentication-Results: i=1; mx5.messagingengine.com; arc=none (no signatures found); dkim=fail (message has been altered, 2048-bit rsa key sha256) header.d=infradead.org header.i=@infradead.org header.b=cUvs3Cp+ x-bits=2048 x-keytype=rsa x-algorithm=sha256 x-selector=bombadil.20170209; dmarc=none (p=none,has-list-id=yes,d=none) header.from=lst.de; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=linux-api-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=lst.de header.result=pass header_is_org_domain=yes; x-vs=clean score=0 state=0 Authentication-Results: mx5.messagingengine.com; arc=none (no signatures found); dkim=fail (message has been altered, 2048-bit rsa key sha256) header.d=infradead.org header.i=@infradead.org header.b=cUvs3Cp+ x-bits=2048 x-keytype=rsa x-algorithm=sha256 x-selector=bombadil.20170209; dmarc=none (p=none,has-list-id=yes,d=none) header.from=lst.de; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=linux-api-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=lst.de header.result=pass header_is_org_domain=yes; x-vs=clean score=0 state=0 X-ME-VSCategory: clean X-CM-Envelope: MS4wfI7IrS3HbtaK4YcT5aW6rTrk9+UEQHY3NV0l2ENhQRVS0JiXk5ix0sFoCFIdbY6K525a7t1z04/AJ/OYsuVuPuabSLM5boJ6kk5O7vRql0Q8BRLUUY73 rV9BuTjlP9sD9LFarYsqYXhA2KdGZFBeh7RnEjStsU+ceCOGW9XTCqOBAZ096dlPiB9T071dYh3GH7CDn+JDAiYkDfOdTjcoDZDtXEFwNfXbEmuIjZqE1wB9 X-CM-Analysis: v=2.3 cv=NPP7BXyg c=1 sm=1 tr=0 a=UK1r566ZdBxH71SXbqIOeA==:117 a=UK1r566ZdBxH71SXbqIOeA==:17 a=v2DPQv5-lfwA:10 a=VwQbUJbxAAAA:8 a=8_ZwOryNcspL-OaGdIgA:9 a=x8gzFH9gYPwA:10 a=AjGcO6oz07-iQ99wixmX:22 X-ME-CMScore: 0 X-ME-CMCategory: none Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752536AbeC3Pcd (ORCPT ); Fri, 30 Mar 2018 11:32:33 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:42738 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751267AbeC3Pca (ORCPT ); Fri, 30 Mar 2018 11:32:30 -0400 From: Christoph Hellwig To: viro@zeniv.linux.org.uk Cc: Avi Kivity , 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 29/32] pipe: convert to ->poll_mask Date: Fri, 30 Mar 2018 17:08:06 +0200 Message-Id: <20180330150809.28094-30-hch@lst.de> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180330150809.28094-1-hch@lst.de> References: <20180330150809.28094-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-api-owner@vger.kernel.org X-Mailing-List: linux-api@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: Signed-off-by: Christoph Hellwig --- fs/pipe.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/fs/pipe.c b/fs/pipe.c index 7b1954caf388..81937590ea0a 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) @@ -1015,7 +1018,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, -- 2.14.2