1 files changed, 11 insertions, 11 deletions

diff --git a/fs/timerfd.c b/fs/timerfd.c
index d84a2bee4f82..cdad49da3ff7 100644
--- a/fs/timerfd.c
+++ b/fs/timerfd.c
@@ -226,20 +226,21 @@ static int timerfd_release(struct inode *inode, struct file *file)
         kfree_rcu(ctx, rcu);
         return 0;
 }
-        
-static struct wait_queue_head *timerfd_get_poll_head(struct file *file,
-                __poll_t eventmask)
+
+static __poll_t timerfd_poll(struct file *file, poll_table *wait)
 {
         struct timerfd_ctx *ctx = file->private_data;
+        __poll_t events = 0;
+        unsigned long flags;
 
-        return &ctx->wqh;
-}
+        poll_wait(file, &ctx->wqh, wait);
 
-static __poll_t timerfd_poll_mask(struct file *file, __poll_t eventmask)
-{
-        struct timerfd_ctx *ctx = file->private_data;
+        spin_lock_irqsave(&ctx->wqh.lock, flags);
+        if (ctx->ticks)
+                events |= EPOLLIN;
+        spin_unlock_irqrestore(&ctx->wqh.lock, flags);
 
-        return ctx->ticks ? EPOLLIN : 0;
+        return events;
 }
 
 static ssize_t timerfd_read(struct file *file, char __user *buf, size_t count,
@@ -363,8 +364,7 @@ static long timerfd_ioctl(struct file *file, unsigned int cmd, unsigned long arg
 
 static const struct file_operations timerfd_fops = {
         .release        = timerfd_release,
-        .get_poll_head  = timerfd_get_poll_head,
-        .poll_mask      = timerfd_poll_mask,
+        .poll           = timerfd_poll,
         .read           = timerfd_read,
         .llseek         = noop_llseek,
         .show_fdinfo    = timerfd_show,