From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-2401354-1526988852-2-12594767396006579587 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.248, MAILING_LIST_MULTI -1, RCVD_IN_DNSWL_HI -5, 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=fm2; t= 1526988851; b=Sn5X3+QcNxcBB2Zm1tSzk2I0Y/lfCmFLebuW72eJLJ2MEjO6I5 zN1F+mNyhTFJ1sZ82AxGcIr7VqRkHSkpFphES2B+GR/Y23KaXusGnj8i7wvXTXPH R5sRXra/5BTY9o3cxiExsyqhlWzXNGOeQzDTQrHaQqNeNsU7prVCOtsi8kG5MEWN WkRhiMStMcsdQTQUCavHzum10uMuQfaCbBdsaw4g3eJwBCAiYOnrO/VePAisShQa 7UzPctO0eotyYibrcFz4P1CH0YUgMlK0dJ1cXW+BL0wVUcpv8on7xyRavEK83ujl G99f4UHJODjWKbgWtl+ML9WKg7lFYbDbQ8OA== 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=1526988851; bh= gL0d0YamFIwaZo14Z2Lx1ovYc9a8+OiSYk5xURHXzuI=; b=JufXi1+dqImSeGrm TP+lI0q7eEDw5yHnvm5bh7EqoG/jrjt/RsSo5hyGntASp+s3BobkpaI1h5JcgTva MNYWZS9PDlipZcnGZ3vZ7QVSb5KM45PvJz5uK8yGTlalX3KtyCFkWYbAgZK6V+Fg pYUcrlB8OPjP4bS9ww0WeCZEb9KXSRwzPPUTWM8j7XTWANQ4+VgoEhzDRM+p05Zq OFyu5Azt0IwbURnTWrpn3qjlpf/Et7xsJlRwEqewZsn6ITTYc1+LGjACBUqOw8Dx /IJWfytJ39CrrUZws2CReiFsSjFWL13B4Wg8Oof9wGxRumBprh+sveOjuxbNK9Iu NMlDnw== ARC-Authentication-Results: i=1; mx3.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=LDF5tsmW 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: mx3.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=LDF5tsmW 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: MS4wfNNlLR+x2Nng+1e1Ly5aQGtVG9BHzFZ1nV5Z6lVJSLISEETFVyVKbV4bmxPqzfZn1tMeBhuDWaTf7AeAfmB9hT1R6vPmX6H0juSq6VBzkPJlFmO9IlTW 10d6C8JQRtq0mM/GJzDM/YUfVqrfK0A7bZWvDYCXP5MoY/XbB3t7SqHtebF6D31vU/yNKI1bmUUQdiXbq1cHQF1Aq2d1Jy7u5+C5OEkHVd5mTGHQiMW/4nVS X-CM-Analysis: v=2.3 cv=Tq3Iegfh 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 S1752964AbeEVLeJ (ORCPT ); Tue, 22 May 2018 07:34:09 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:36812 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751548AbeEVLdH (ORCPT ); Tue, 22 May 2018 07:33:07 -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/31] eventfd: switch to ->poll_mask Date: Tue, 22 May 2018 13:31:06 +0200 Message-Id: <20180522113108.25713-30-hch@lst.de> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180522113108.25713-1-hch@lst.de> References: <20180522113108.25713-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