Commit 4130b499 authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe
Browse files

io_uring/rsrc: inline io_rsrc_put_work() 



io_rsrc_put_work() is simple enough to be open coded into its only
caller.

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


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

io_uring/rsrc.c

+6 −13
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ static void io_buffer_unmap(struct io_ring_ctx *ctx, struct io_mapped_ubuf **slo 
	*slot = NULL;

}



static void io_rsrc_put_work_one(struct io_rsrc_data *rsrc_data,

static void io_rsrc_put_work(struct io_rsrc_data *rsrc_data,

			     struct io_rsrc_put *prsrc)

{

	struct io_ring_ctx *ctx = rsrc_data->ctx;
@@ -150,16 +150,6 @@ static void io_rsrc_put_work_one(struct io_rsrc_data *rsrc_data, 
	rsrc_data->do_put(ctx, prsrc);

}



static void __io_rsrc_put_work(struct io_rsrc_node *ref_node)

{

	struct io_rsrc_data *rsrc_data = ref_node->rsrc_data;



	if (likely(!ref_node->empty))

		io_rsrc_put_work_one(rsrc_data, &ref_node->item);



	io_rsrc_node_destroy(rsrc_data->ctx, ref_node);

}



void io_rsrc_node_destroy(struct io_ring_ctx *ctx, struct io_rsrc_node *node)

{

	if (!io_alloc_cache_put(&ctx->rsrc_node_cache, &node->cache))
@@ -178,7 +168,10 @@ void io_rsrc_node_ref_zero(struct io_rsrc_node *node) 
		if (node->refs)

			break;

		list_del(&node->node);

		__io_rsrc_put_work(node);



		if (likely(!node->empty))

			io_rsrc_put_work(node->rsrc_data, &node->item);

		io_rsrc_node_destroy(ctx, node);

	}

	if (list_empty(&ctx->rsrc_ref_list) && unlikely(ctx->rsrc_quiesce))

		wake_up_all(&ctx->rsrc_quiesce_wq);

io_uring/rsrc.h

+0 −1
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ struct io_mapped_ubuf { 


void io_rsrc_put_tw(struct callback_head *cb);

void io_rsrc_node_ref_zero(struct io_rsrc_node *node);

void io_rsrc_put_work(struct work_struct *work);

void io_rsrc_node_destroy(struct io_ring_ctx *ctx, struct io_rsrc_node *ref_node);

struct io_rsrc_node *io_rsrc_node_alloc(struct io_ring_ctx *ctx);

int io_queue_rsrc_removal(struct io_rsrc_data *data, unsigned idx, void *rsrc);