From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-2302514-1516652166-2-18132783944661564017 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.25, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES roen, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', 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=arctest; t=1516652166; b=fx0WzDqsWsPz+yttJZPaSdXdawIakzs3ktsFt6h30zz3Wtt 6/5s3l/OAnLjx8i4OyBoNTFKakxSNLvX4fkpNcICi5FwU+r7SdPzjmJAulGOTBam rg31U8r2KSxKr+tpy7ET7dM5f9xwQhQcAxMST0V5ckkbmWNblvZS14bLZGl//jng v3GE/zz1AuiCW9wMjte4GwAjPFOpdvoSC/exnS7AwYMQapV8hNBICKGrHJXAFLRO I0XtBI8HX0CGGx5IitapWH8pZ0i6Azq0rrg7GvA1VLVQe6AbNQw2p+7C4LfjjAL4 BP5hxCqpWa+tcS/yPqt0GHGyN2xLilJb4YYOFdg== 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=arctest; t=1516652166; bh=JPNOrtBwMQGnQ23FS8kHcEo5YF7y4rij+nwGNZl3RAE=; b=N98gxXTyyHiT PF0Okg3gXt9KoeV6MdGSnXCYADViRkORvSb5Wi+uONV4bgKispvAFkPkrnCWiCMq n4z5wzDiQDgecblujpmgfOUfVfP146Lnn8MP5EixGcEPfD2n7z3W95uC2JDVBzhU UiJ4cCpiyLpMdoqeA2Jl8p9u/St2QbIQgejhRrT7TZgI7FZw/eW+x92VQ2NWdQzP QszCGo0y9uziI5FLnu1hJ6KfRS36duvr48tPv91HcBd5jq9GvuKubwXz6f3RG5Gh 4ekwlXGNAQo07wyKM8dgJ9Nd9+wSSpi8QN7kkXEsSkY09++9hFxQIRZr4dCRR0S6 7VQR48vOvg== 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=ukdiEGM0 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-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 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=ukdiEGM0 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-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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751884AbeAVUPt (ORCPT ); Mon, 22 Jan 2018 15:15:49 -0500 Received: from bombadil.infradead.org ([65.50.211.133]:35821 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751972AbeAVUOi (ORCPT ); Mon, 22 Jan 2018 15:14:38 -0500 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 34/36] eventfd: switch to ->poll_mask Date: Mon, 22 Jan 2018 21:12:41 +0100 Message-Id: <20180122201243.31610-35-hch@lst.de> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180122201243.31610-1-hch@lst.de> References: <20180122201243.31610-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/eventfd.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/fs/eventfd.c b/fs/eventfd.c index 6318a9b57e53..2bbbf13cb816 100644 --- a/fs/eventfd.c +++ b/fs/eventfd.c @@ -114,14 +114,20 @@ static int eventfd_release(struct inode *inode, struct file *file) return 0; } -static __poll_t eventfd_poll(struct file *file, poll_table *wait) +static struct wait_queue_head * +eventfd_get_poll_head(struct file *file, __poll_t events) +{ + struct eventfd_ctx *ctx = file->private_data; + + return &ctx->wqh; +} + +static __poll_t eventfd_poll_mask(struct file *file, __poll_t eventmask) { struct eventfd_ctx *ctx = file->private_data; __poll_t events = 0; u64 count; - poll_wait(file, &ctx->wqh, wait); - /* * All writes to ctx->count occur within ctx->wqh.lock. This read * can be done outside ctx->wqh.lock because we know that poll_wait @@ -341,7 +347,8 @@ static const struct file_operations eventfd_fops = { .show_fdinfo = eventfd_show_fdinfo, #endif .release = eventfd_release, - .poll = eventfd_poll, + .get_poll_head = eventfd_get_poll_head, + .poll_mask = eventfd_poll_mask, .read = eventfd_read, .write = eventfd_write, .llseek = noop_llseek, -- 2.14.2