Commit 5a754dea authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe
Browse files

io_uring: move io_clean_op() 



Move io_clean_op() up in the source file and remove the forward
declaration, as the function doesn't have tricky dependencies
anymore.

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


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

io_uring/io_uring.c

+33 −34
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_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);

static void __io_submit_flush_completions(struct io_ring_ctx *ctx);
@@ -367,6 +366,39 @@ static bool req_need_defer(struct io_kiocb *req, u32 seq) 
	return false;

}



static void io_clean_op(struct io_kiocb *req)

{

	if (req->flags & REQ_F_BUFFER_SELECTED) {

		spin_lock(&req->ctx->completion_lock);

		io_put_kbuf_comp(req);

		spin_unlock(&req->ctx->completion_lock);

	}



	if (req->flags & REQ_F_NEED_CLEANUP) {

		const struct io_cold_def *def = &io_cold_defs[req->opcode];



		if (def->cleanup)

			def->cleanup(req);

	}

	if ((req->flags & REQ_F_POLLED) && req->apoll) {

		kfree(req->apoll->double_poll);

		kfree(req->apoll);

		req->apoll = NULL;

	}

	if (req->flags & REQ_F_INFLIGHT) {

		struct io_uring_task *tctx = req->task->io_uring;



		atomic_dec(&tctx->inflight_tracked);

	}

	if (req->flags & REQ_F_CREDS)

		put_cred(req->creds);

	if (req->flags & REQ_F_ASYNC_DATA) {

		kfree(req->async_data);

		req->async_data = NULL;

	}

	req->flags &= ~IO_REQ_CLEAN_FLAGS;

}



static inline void io_req_track_inflight(struct io_kiocb *req)

{

	if (!(req->flags & REQ_F_INFLIGHT)) {
@@ -1823,39 +1855,6 @@ static __cold void io_drain_req(struct io_kiocb *req) 
	spin_unlock(&ctx->completion_lock);

}



static void io_clean_op(struct io_kiocb *req)

{

	if (req->flags & REQ_F_BUFFER_SELECTED) {

		spin_lock(&req->ctx->completion_lock);

		io_put_kbuf_comp(req);

		spin_unlock(&req->ctx->completion_lock);

	}



	if (req->flags & REQ_F_NEED_CLEANUP) {

		const struct io_cold_def *def = &io_cold_defs[req->opcode];



		if (def->cleanup)

			def->cleanup(req);

	}

	if ((req->flags & REQ_F_POLLED) && req->apoll) {

		kfree(req->apoll->double_poll);

		kfree(req->apoll);

		req->apoll = NULL;

	}

	if (req->flags & REQ_F_INFLIGHT) {

		struct io_uring_task *tctx = req->task->io_uring;



		atomic_dec(&tctx->inflight_tracked);

	}

	if (req->flags & REQ_F_CREDS)

		put_cred(req->creds);

	if (req->flags & REQ_F_ASYNC_DATA) {

		kfree(req->async_data);

		req->async_data = NULL;

	}

	req->flags &= ~IO_REQ_CLEAN_FLAGS;

}



static bool io_assign_file(struct io_kiocb *req, const struct io_issue_def *def,

			   unsigned int issue_flags)

{