io_uring: clean up io_poll_task_func()

io_poll_complete() always fills an event (even an overflowed one), so we
always should do io_cqring_ev_posted() afterwards. And that's what is
currently happening, because second EPOLLONESHOT check is always true,
it can't return !done for oneshots.

Remove those branching, it's much easier to read.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 0fcb0f477d9ee9fe2f83fb4e47e6c7b82faf27fa..33bb1431308420f3835d4ec1ecde4907a874378e 100644 (file)
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -4926,20 +4926,18 @@ static void io_poll_task_func(struct callback_head *cb)
        if (io_poll_rewait(req, &req->poll)) {
                spin_unlock_irq(&ctx->completion_lock);
        } else {
-               bool done, post_ev;
+               bool done;
 
-               post_ev = done = io_poll_complete(req, req->result, 0);
+               done = io_poll_complete(req, req->result, 0);
                if (done) {
                        hash_del(&req->hash_node);
-               } else if (!(req->poll.events & EPOLLONESHOT)) {
-                       post_ev = true;
+               } else {
                        req->result = 0;
                        add_wait_queue(req->poll.head, &req->poll.wait);
                }
                spin_unlock_irq(&ctx->completion_lock);
+               io_cqring_ev_posted(ctx);
 
-               if (post_ev)
-                       io_cqring_ev_posted(ctx);
                if (done) {
                        nxt = io_put_req_find_next(req);
                        if (nxt)