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: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/1b36dd46766ced39a9b160767babfa2fce07b8f8.1681822823.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/io_uring/rsrc.c b/io_uring/rsrc.c
index 127bd602131e534533af815fa0f751c55b1b221a..d1167b0643b74d01e279c2cf379c327c8911be30 100644 (file)
--- a/io_uring/rsrc.c
+++ b/io_uring/rsrc.c
@@ -140,8 +140,8 @@ 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,
-                                struct io_rsrc_put *prsrc)
+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);

diff --git a/io_uring/rsrc.h b/io_uring/rsrc.h
index f3fe455c6c712fc91cca1d29aaf037aa66f38ac3..232079363f6aa999c4eb9285aa964c9c31deb7dc 100644 (file)
--- a/io_uring/rsrc.h
+++ b/io_uring/rsrc.h
@@ -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);