From c732ea242d565c8281c4b017929fc62a246d81b9 Mon Sep 17 00:00:00 2001 From: Pavel Begunkov Date: Thu, 13 Apr 2023 15:28:06 +0100 Subject: [PATCH] io_uring/rsrc: remove io_rsrc_node::done Kill io_rsrc_node::node and check refs instead, it's set when the nodes refcount hits zero, and it won't change afterwards. Signed-off-by: Pavel Begunkov Link: https://lore.kernel.org/r/bbde361f4010f7e8bf196f1ecca27a763b79926f.1681395792.git.asml.silence@gmail.com Signed-off-by: Jens Axboe --- io_uring/rsrc.c | 5 +---- io_uring/rsrc.h | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/io_uring/rsrc.c b/io_uring/rsrc.c index 3c1538b..5fc9d10 100644 --- a/io_uring/rsrc.c +++ b/io_uring/rsrc.c @@ -191,14 +191,12 @@ void io_rsrc_node_ref_zero(struct io_rsrc_node *node) { struct io_ring_ctx *ctx = node->rsrc_data->ctx; - node->done = true; while (!list_empty(&ctx->rsrc_ref_list)) { node = list_first_entry(&ctx->rsrc_ref_list, struct io_rsrc_node, node); /* recycle ref nodes in order */ - if (!node->done) + if (node->refs) break; - list_del(&node->node); __io_rsrc_put_work(node); } @@ -222,7 +220,6 @@ struct io_rsrc_node *io_rsrc_node_alloc(struct io_ring_ctx *ctx) ref_node->refs = 1; INIT_LIST_HEAD(&ref_node->node); INIT_LIST_HEAD(&ref_node->item_list); - ref_node->done = false; ref_node->inline_items = 0; return ref_node; } diff --git a/io_uring/rsrc.h b/io_uring/rsrc.h index 17dfe18..88adcb0 100644 --- a/io_uring/rsrc.h +++ b/io_uring/rsrc.h @@ -48,7 +48,6 @@ struct io_rsrc_node { struct list_head node; struct llist_node llist; int refs; - bool done; /* * Keeps a list of struct io_rsrc_put to be completed. Each entry -- 2.7.4