io_uring: remove unused return from io_disarm_next

We removed conditional io_commit_cqring_flush() guarding against
spurious eventfd and the io_disarm_next()'s return value is not used
anymore, just void it.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/9a441c9a32a58bcc586076fa9a7d0dc33f1fb3cb.1662652536.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/io_uring/timeout.c b/io_uring/timeout.c
index 78ea2c64b70e0e11ab95d4cc57073db3c475bd9b..e8a8c20994805ced29c10543b1aa637c8e32c389 100644 (file)
--- a/io_uring/timeout.c
+++ b/io_uring/timeout.c
@@ -149,11 +149,10 @@ static inline void io_remove_next_linked(struct io_kiocb *req)
        nxt->link = NULL;
 }
 
-bool io_disarm_next(struct io_kiocb *req)
+void io_disarm_next(struct io_kiocb *req)
        __must_hold(&req->ctx->completion_lock)
 {
        struct io_kiocb *link = NULL;
-       bool posted = false;
 
        if (req->flags & REQ_F_ARM_LTIMEOUT) {
                link = req->link;
@@ -161,7 +160,6 @@ bool io_disarm_next(struct io_kiocb *req)
                if (link && link->opcode == IORING_OP_LINK_TIMEOUT) {
                        io_remove_next_linked(req);
                        io_req_tw_post_queue(link, -ECANCELED, 0);
-                       posted = true;
                }
        } else if (req->flags & REQ_F_LINK_TIMEOUT) {
                struct io_ring_ctx *ctx = req->ctx;
@@ -169,17 +167,12 @@ bool io_disarm_next(struct io_kiocb *req)
                spin_lock_irq(&ctx->timeout_lock);
                link = io_disarm_linked_timeout(req);
                spin_unlock_irq(&ctx->timeout_lock);
-               if (link) {
-                       posted = true;
+               if (link)
                        io_req_tw_post_queue(link, -ECANCELED, 0);
-               }
        }
        if (unlikely((req->flags & REQ_F_FAIL) &&
-                    !(req->flags & REQ_F_HARDLINK))) {
-               posted |= (req->link != NULL);
+                    !(req->flags & REQ_F_HARDLINK)))
                io_fail_links(req);
-       }
-       return posted;
 }
 
 struct io_kiocb *__io_disarm_linked_timeout(struct io_kiocb *req,

diff --git a/io_uring/timeout.h b/io_uring/timeout.h
index 858c62644897a55236e834605d77156acee4c042..a6939f18313e86e66574232c3b2d041a161add60 100644 (file)
--- a/io_uring/timeout.h
+++ b/io_uring/timeout.h
@@ -27,7 +27,7 @@ int io_timeout_cancel(struct io_ring_ctx *ctx, struct io_cancel_data *cd);
 __cold bool io_kill_timeouts(struct io_ring_ctx *ctx, struct task_struct *tsk,
                             bool cancel_all);
 void io_queue_linked_timeout(struct io_kiocb *req);
-bool io_disarm_next(struct io_kiocb *req);
+void io_disarm_next(struct io_kiocb *req);
 
 int io_timeout_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe);
 int io_link_timeout_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe);