]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
io_uring: simplify drain ret passing
authorPavel Begunkov <asml.silence@gmail.com>
Fri, 9 May 2025 11:12:49 +0000 (12:12 +0100)
committerJens Axboe <axboe@kernel.dk>
Fri, 9 May 2025 14:01:01 +0000 (08:01 -0600)
"ret" in io_drain_req() is only used in one place, remove it and pass
-ENOMEM directly.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/ece724b77e66e6caabcc215e0032ee7ff140f289.1746788718.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
io_uring/io_uring.c

index 7491793c80bac0f734997799d7499774bc08036a..6b606e9dffa391ced0ed332226919c9b15394ffb 100644 (file)
@@ -1672,7 +1672,6 @@ static __cold void io_drain_req(struct io_kiocb *req)
 {
        struct io_ring_ctx *ctx = req->ctx;
        struct io_defer_entry *de;
-       int ret;
        u32 seq = io_get_sequence(req);
 
        /* Still need defer if there is pending req in defer list. */
@@ -1689,8 +1688,7 @@ queue:
        io_prep_async_link(req);
        de = kmalloc(sizeof(*de), GFP_KERNEL_ACCOUNT);
        if (!de) {
-               ret = -ENOMEM;
-               io_req_defer_failed(req, ret);
+               io_req_defer_failed(req, -ENOMEM);
                return;
        }