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 31/32] timerfd: convert to ->poll_mask
Date: Fri, 11 May 2018 13:08:02 +0200 [thread overview]
Message-ID: <20180511110803.10910-32-hch@lst.de> (raw)
In-Reply-To: <20180511110803.10910-1-hch@lst.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
fs/timerfd.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/fs/timerfd.c b/fs/timerfd.c
index cdad49da3ff7..d84a2bee4f82 100644
--- a/fs/timerfd.c
+++ b/fs/timerfd.c
@@ -226,21 +226,20 @@ static int timerfd_release(struct inode *inode, struct file *file)
kfree_rcu(ctx, rcu);
return 0;
}
-
-static __poll_t timerfd_poll(struct file *file, poll_table *wait)
+
+static struct wait_queue_head *timerfd_get_poll_head(struct file *file,
+ __poll_t eventmask)
{
struct timerfd_ctx *ctx = file->private_data;
- __poll_t events = 0;
- unsigned long flags;
- poll_wait(file, &ctx->wqh, wait);
+ return &ctx->wqh;
+}
- spin_lock_irqsave(&ctx->wqh.lock, flags);
- if (ctx->ticks)
- events |= EPOLLIN;
- spin_unlock_irqrestore(&ctx->wqh.lock, flags);
+static __poll_t timerfd_poll_mask(struct file *file, __poll_t eventmask)
+{
+ struct timerfd_ctx *ctx = file->private_data;
- return events;
+ return ctx->ticks ? EPOLLIN : 0;
}
static ssize_t timerfd_read(struct file *file, char __user *buf, size_t count,
@@ -364,7 +363,8 @@ static long timerfd_ioctl(struct file *file, unsigned int cmd, unsigned long arg
static const struct file_operations timerfd_fops = {
.release = timerfd_release,
- .poll = timerfd_poll,
+ .get_poll_head = timerfd_get_poll_head,
+ .poll_mask = timerfd_poll_mask,
.read = timerfd_read,
.llseek = noop_llseek,
.show_fdinfo = timerfd_show,
--
2.17.0
next prev parent reply other threads:[~2018-05-11 11:09 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-11 11:07 aio poll and a new in-kernel poll API V10 Christoph Hellwig
2018-05-11 11:07 ` [PATCH 01/32] fs: unexport poll_schedule_timeout Christoph Hellwig
2018-05-11 11:07 ` [PATCH 02/32] fs: cleanup do_pollfd Christoph Hellwig
2018-05-11 11:07 ` [PATCH 03/32] fs: update documentation to mention __poll_t and match the code Christoph Hellwig
2018-05-11 11:07 ` [PATCH 04/32] fs: add new vfs_poll and file_can_poll helpers Christoph Hellwig
2018-05-11 11:07 ` [PATCH 05/32] fs: introduce new ->get_poll_head and ->poll_mask methods Christoph Hellwig
2018-05-11 11:07 ` [PATCH 06/32] aio: simplify KIOCB_KEY handling Christoph Hellwig
2018-05-11 11:07 ` [PATCH 07/32] aio: simplify cancellation Christoph Hellwig
2018-05-11 11:07 ` [PATCH 08/32] aio: replace kiocb_set_cancel_fn with a cancel_kiocb file operation Christoph Hellwig
2018-05-11 11:07 ` [PATCH 09/32] aio: add delayed cancel support Christoph Hellwig
2018-05-11 11:07 ` [PATCH 10/32] aio: implement IOCB_CMD_POLL Christoph Hellwig
2018-05-11 11:07 ` [PATCH 11/32] net: refactor socket_poll Christoph Hellwig
2018-05-11 11:07 ` [PATCH 12/32] net: add support for ->poll_mask in proto_ops Christoph Hellwig
2018-05-11 11:07 ` [PATCH 13/32] net: remove sock_no_poll Christoph Hellwig
2018-05-11 11:07 ` [PATCH 14/32] net/tcp: convert to ->poll_mask Christoph Hellwig
2018-05-11 13:13 ` Eric Dumazet
2018-05-12 10:09 ` Christoph Hellwig
2018-05-11 11:07 ` [PATCH 15/32] net/unix: " Christoph Hellwig
2018-05-11 11:07 ` [PATCH 16/32] net: convert datagram_poll users tp ->poll_mask Christoph Hellwig
2018-05-11 11:07 ` [PATCH 17/32] net/dccp: convert to ->poll_mask Christoph Hellwig
2018-05-11 11:07 ` [PATCH 18/32] net/atm: " Christoph Hellwig
2018-05-11 11:07 ` [PATCH 19/32] net/vmw_vsock: " Christoph Hellwig
2018-05-11 11:07 ` [PATCH 20/32] net/tipc: " Christoph Hellwig
2018-05-11 11:07 ` [PATCH 21/32] net/sctp: " Christoph Hellwig
2018-05-11 11:07 ` [PATCH 22/32] net/bluetooth: " Christoph Hellwig
2018-05-11 11:07 ` [PATCH 23/32] net/caif: " Christoph Hellwig
2018-05-11 11:07 ` [PATCH 24/32] net/nfc: " Christoph Hellwig
2018-05-11 11:07 ` [PATCH 25/32] net/phonet: " Christoph Hellwig
2018-05-11 11:07 ` [PATCH 26/32] net/iucv: " Christoph Hellwig
2018-05-11 11:07 ` [PATCH 27/32] net/rxrpc: " Christoph Hellwig
2018-05-11 11:07 ` [PATCH 28/32] crypto: af_alg: " Christoph Hellwig
2018-05-11 11:08 ` [PATCH 29/32] pipe: " Christoph Hellwig
2018-05-11 11:08 ` [PATCH 30/32] eventfd: switch " Christoph Hellwig
2018-05-11 11:08 ` Christoph Hellwig [this message]
2018-05-11 11:08 ` [PATCH 32/32] random: convert " Christoph Hellwig
-- strict thread matches above, loose matches on Subject: below --
2018-05-15 19:48 aio poll and a new in-kernel poll API V11 Christoph Hellwig
2018-05-15 19:48 ` [PATCH 31/32] timerfd: convert to ->poll_mask Christoph Hellwig
2018-03-30 15:07 aio poll and a new in-kernel poll API V9 Christoph Hellwig
2018-03-30 15:08 ` [PATCH 31/32] timerfd: convert to ->poll_mask Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180511110803.10910-32-hch@lst.de \
--to=hch@lst.de \
--cc=avi@scylladb.com \
--cc=linux-aio@kvack.org \
--cc=linux-api@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).