Commit 3b7a612f authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe
Browse files

io_uring: inline io_dismantle_req() 



io_dismantle_req() is only used in __io_req_complete_post(), open code
it there.

Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/ba8f20cb2c914eefa2e7d120a104a198552050db.1687518903.git.asml.silence@gmail.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 6ec9afc7

io_uring/io_uring.c

+5 −12
Original line number Diff line number Diff line
@@ -146,7 +146,6 @@ static bool io_uring_try_cancel_requests(struct io_ring_ctx *ctx, 
					 struct task_struct *task,

					 bool cancel_all);



static void io_dismantle_req(struct io_kiocb *req);

static void io_clean_op(struct io_kiocb *req);

static void io_queue_sqe(struct io_kiocb *req);

static void io_move_task_work_from_local(struct io_ring_ctx *ctx);
@@ -991,7 +990,11 @@ static void __io_req_complete_post(struct io_kiocb *req, unsigned issue_flags) 
			}

		}

		io_put_kbuf_comp(req);

		io_dismantle_req(req);

		if (unlikely(req->flags & IO_REQ_CLEAN_FLAGS))

			io_clean_op(req);

		if (!(req->flags & REQ_F_FIXED_FILE))

			io_put_file(req->file);



		rsrc_node = req->rsrc_node;

		/*

		 * Selected buffer deallocation in io_clean_op() assumes that
@@ -1111,16 +1114,6 @@ __cold bool __io_alloc_req_refill(struct io_ring_ctx *ctx) 
	return true;

}



static inline void io_dismantle_req(struct io_kiocb *req)

{

	unsigned int flags = req->flags;



	if (unlikely(flags & IO_REQ_CLEAN_FLAGS))

		io_clean_op(req);

	if (!(flags & REQ_F_FIXED_FILE))

		io_put_file(req->file);

}



__cold void io_free_req(struct io_kiocb *req)

{

	/* refs were already put, restore them for io_req_task_complete() */