lkml.org 
[lkml]   [2022]   [Jun]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.18 108/181] io_uring: make apoll_events a __poll_t
    Date
    From: Christoph Hellwig <hch@lst.de>

    [ Upstream commit 58f5c8d39e0ea07fdaaea6a85c49000da83dc0cc ]

    apoll_events is fed to vfs_poll and the poll tables, so it should be
    a __poll_t.

    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Link: https://lore.kernel.org/r/20220518084005.3255380-5-hch@lst.de
    Signed-off-by: Jens Axboe <axboe@kernel.dk>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/io_uring.c | 7 ++++---
    1 file changed, 4 insertions(+), 3 deletions(-)

    diff --git a/fs/io_uring.c b/fs/io_uring.c
    index ca9ed3d899e6..1070d22a1c2b 100644
    --- a/fs/io_uring.c
    +++ b/fs/io_uring.c
    @@ -926,7 +926,7 @@ struct io_kiocb {
    /* used by request caches, completion batching and iopoll */
    struct io_wq_work_node comp_list;
    /* cache ->apoll->events */
    - int apoll_events;
    + __poll_t apoll_events;
    };
    atomic_t refs;
    atomic_t poll_refs;
    @@ -5984,7 +5984,7 @@ static void io_apoll_task_func(struct io_kiocb *req, bool *locked)
    io_req_complete_failed(req, ret);
    }

    -static void __io_poll_execute(struct io_kiocb *req, int mask, int events)
    +static void __io_poll_execute(struct io_kiocb *req, int mask, __poll_t events)
    {
    req->result = mask;
    /*
    @@ -6003,7 +6003,8 @@ static void __io_poll_execute(struct io_kiocb *req, int mask, int events)
    io_req_task_work_add(req, false);
    }

    -static inline void io_poll_execute(struct io_kiocb *req, int res, int events)
    +static inline void io_poll_execute(struct io_kiocb *req, int res,
    + __poll_t events)
    {
    if (io_poll_get_ownership(req))
    __io_poll_execute(req, res, events);
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-27 13:56    [W:2.900 / U:0.328 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site