lkml.org 
[lkml]   [2018]   [May]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    SubjectRe: [PATCH 30/31] timerfd: convert to ->poll_mask
    From
    Date
    Hello!

    On 05/22/2018 02:31 PM, Christoph Hellwig wrote:

    > 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)
    > +

    Stray tab detected! :-)

    > +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,
    [...]

    MBR, Sergei

    \
     
     \ /
      Last update: 2018-05-22 19:00    [W:4.284 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site