lkml.org 
[lkml]   [2018]   [Mar]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 28/30] eventfd: switch to ->poll_mask
    Date
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    ---
    fs/eventfd.c | 15 +++++++++++----
    1 file changed, 11 insertions(+), 4 deletions(-)

    diff --git a/fs/eventfd.c b/fs/eventfd.c
    index 012f5bd46dfa..d70b4907f978 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.14.2
    \
     
     \ /
      Last update: 2018-03-29 22:36    [W:4.694 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site