]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
io_uring: remove async/poll related provided buffer recycles
authorJens Axboe <axboe@kernel.dk>
Thu, 21 Aug 2025 02:03:40 +0000 (20:03 -0600)
committerJens Axboe <axboe@kernel.dk>
Sun, 24 Aug 2025 17:41:12 +0000 (11:41 -0600)
These aren't necessary anymore, get rid of them.

Link: https://lore.kernel.org/r/20250821020750.598432-13-axboe@kernel.dk
Signed-off-by: Jens Axboe <axboe@kernel.dk>
io_uring/io_uring.c
io_uring/poll.c

index 985b4681e5131f06eb48959949669b06dc7feb2e..5166f11f07c7eef13f25bfd6da9267106c09a68c 100644 (file)
@@ -2025,11 +2025,9 @@ fail:
 
        switch (io_arm_poll_handler(req, 0)) {
        case IO_APOLL_READY:
-               io_kbuf_recycle(req, NULL, 0);
                io_req_task_queue(req);
                break;
        case IO_APOLL_ABORTED:
-               io_kbuf_recycle(req, NULL, 0);
                io_queue_iowq(req);
                break;
        case IO_APOLL_OK:
index f3852bf7627b16d6332139af9540fa8341f9e021..ea75c5cd81a0232c6a24a63b160412713559b318 100644 (file)
@@ -316,10 +316,8 @@ void io_poll_task_func(struct io_kiocb *req, io_tw_token_t tw)
 
        ret = io_poll_check_events(req, tw);
        if (ret == IOU_POLL_NO_ACTION) {
-               io_kbuf_recycle(req, NULL, 0);
                return;
        } else if (ret == IOU_POLL_REQUEUE) {
-               io_kbuf_recycle(req, NULL, 0);
                __io_poll_execute(req, 0);
                return;
        }
@@ -686,8 +684,6 @@ int io_arm_apoll(struct io_kiocb *req, unsigned issue_flags, __poll_t mask)
        req->flags |= REQ_F_POLLED;
        ipt.pt._qproc = io_async_queue_proc;
 
-       io_kbuf_recycle(req, NULL, issue_flags);
-
        ret = __io_arm_poll_handler(req, &apoll->poll, &ipt, mask, issue_flags);
        if (ret)
                return ret > 0 ? IO_APOLL_READY : IO_APOLL_ABORTED;