From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-3782484-1526037045-2-17286496494328716285 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, MAILING_LIST_MULTI -1, RCVD_IN_DNSWL_HI -5, LANGUAGES unknown, 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=fm2; t= 1526037045; b=T5lNv2B5CmPp5b5Nj7CbQB0xmCTJ91JG7o8PB2PgnSiexwAPSE VqMwwfIZITYp3XiBGTE0IftzhbP/7edwEEr30vEut9OKgywixBkH+NxsUPTE5nf2 UUT4GsEG9OCQxHZz99us7jVltDGA78jTnAM0XY9koJyPLHOvKggTDSXdo9mvIMBT 2B1C28/J2x9nsDIJGhyehrRalpHivdtYBuGkg//6p5tkt18d2qoV0xI9jBBGrqD6 1R7va9gq+TP4DrPXDYBSfiYSwgLSuqfRb+mMDjAfLujaCWaqEa7INg87a16bMV1b /5mFL43bC2eg3FZEAsBEdzox+MHJrm0eKAbw== 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=1526037045; bh= gL0d0YamFIwaZo14Z2Lx1ovYc9a8+OiSYk5xURHXzuI=; b=hrxZ5ftI43N5u0N+ HkqXkP7A/9BRVBjF1zb7aN0mq9Kpd50f1tvTGv7j3pDgPBp7oUkOIvcGtWE5iVxQ l71ZdpIhsJiGk9FRChhbx9qc4i0b9OpPMifWHKTZhVJivMd3DcCERsUJN+qQJ7ud j29LX8Ov+sl4EokcijLYFUgcHpQoXpiKSWP+5Kwuztc/Ti1BBPl7Uw/LQF/y1SPs cQTOOwqxa883AWDl98JWpv0e9cBwu/j2ellh9FBJt4i4MXc/hZa0N0y7H9zqXl5d o8ZQfeFK4uwEVazq16foOcHo5H7foU94M9zxWxoDS3d/0ui+ciUq5+M6WcMWBBbi sF0u4Q== 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=nIEcANbE 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=nIEcANbE 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: MS4wfDOyAuH3pTyYPe7Infx/HYqUgYK3N/rM5KLERYvC9gUETgdNRP2amft+eoSZLj5PSxqxR9ed1BlkOOU0scAquVqwA1Dh2WeXp5Jx5WkEXBEn8tkKjgSp g6cdr9/C6PNUrj+nc6KJTyQTRu2AKdf/PIbyNAO4qVuL6T6RlqEXmWesoR9lNSzd1+XKNS/xEFFIhmO3IqnV98rWJeiZgke38V9tOv5uitWKuunNaGhwxPGc X-CM-Analysis: v=2.3 cv=NPP7BXyg c=1 sm=1 tr=0 a=UK1r566ZdBxH71SXbqIOeA==:117 a=UK1r566ZdBxH71SXbqIOeA==:17 a=VUJBJC2UJ8kA:10 a=VwQbUJbxAAAA:8 a=glk3bNZYZL77nadNM_AA: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 S1753468AbeEKLJm (ORCPT ); Fri, 11 May 2018 07:09:42 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:47574 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753372AbeEKLJk (ORCPT ); Fri, 11 May 2018 07:09:40 -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 30/32] eventfd: switch to ->poll_mask Date: Fri, 11 May 2018 13:08:01 +0200 Message-Id: <20180511110803.10910-31-hch@lst.de> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180511110803.10910-1-hch@lst.de> References: <20180511110803.10910-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 08d3bd602f73..61c9514da5e9 100644 --- a/fs/eventfd.c +++ b/fs/eventfd.c @@ -101,14 +101,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 @@ -305,7 +311,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.17.0