Commit 360173ab authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe
Browse files

io_uring: move io_run_local_work_locked 



io_run_local_work_locked() is only used in io_uring.c, move it there.
With that we can also make __io_run_local_work() static.

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


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

io_uring/io_uring.c

+17 −1
Original line number Diff line number Diff line
@@ -1296,7 +1296,7 @@ static void __cold io_move_task_work_from_local(struct io_ring_ctx *ctx) 
	}

}



int __io_run_local_work(struct io_ring_ctx *ctx, bool *locked)

static int __io_run_local_work(struct io_ring_ctx *ctx, bool *locked)

{

	struct llist_node *node;

	struct llist_node fake;
@@ -1337,6 +1337,22 @@ int __io_run_local_work(struct io_ring_ctx *ctx, bool *locked) 


}



static inline int io_run_local_work_locked(struct io_ring_ctx *ctx)

{

	bool locked;

	int ret;



	if (llist_empty(&ctx->work_llist))

		return 0;



	locked = true;

	ret = __io_run_local_work(ctx, &locked);

	/* shouldn't happen! */

	if (WARN_ON_ONCE(!locked))

		mutex_lock(&ctx->uring_lock);

	return ret;

}



static int io_run_local_work(struct io_ring_ctx *ctx)

{

	bool locked = mutex_trylock(&ctx->uring_lock);

io_uring/io_uring.h

+0 −17
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ enum { 
struct io_uring_cqe *__io_get_cqe(struct io_ring_ctx *ctx, bool overflow);

bool io_req_cqe_overflow(struct io_kiocb *req);

int io_run_task_work_sig(struct io_ring_ctx *ctx);

int __io_run_local_work(struct io_ring_ctx *ctx, bool *locked);

void io_req_defer_failed(struct io_kiocb *req, s32 res);

void io_req_complete_post(struct io_kiocb *req, unsigned issue_flags);

bool io_post_aux_cqe(struct io_ring_ctx *ctx, u64 user_data, s32 res, u32 cflags);
@@ -283,22 +282,6 @@ static inline bool io_task_work_pending(struct io_ring_ctx *ctx) 
	return task_work_pending(current) || !wq_list_empty(&ctx->work_llist);

}



static inline int io_run_local_work_locked(struct io_ring_ctx *ctx)

{

	bool locked;

	int ret;



	if (llist_empty(&ctx->work_llist))

		return 0;



	locked = true;

	ret = __io_run_local_work(ctx, &locked);

	/* shouldn't happen! */

	if (WARN_ON_ONCE(!locked))

		mutex_lock(&ctx->uring_lock);

	return ret;

}



static inline void io_tw_lock(struct io_ring_ctx *ctx, bool *locked)

{

	if (!*locked) {