io_uring/rsrc: kill io_charge_rsrc_node()

axboe · axboe · commit e410ffca5886 · 2024-10-29T13:43:28.000-06:00
It's only used from __io_req_set_rsrc_node(), and it takes both the ctx
and node itself, while never using the ctx. Just open-code the basic
refs++ in __io_req_set_rsrc_node() instead.

Signed-off-by: Jens Axboe &lt;axboe@kernel.dk&gt;
diff --git a/io_uring/rsrc.h b/io_uring/rsrc.h
@@ -97,18 +97,12 @@ static inline void io_put_rsrc_node(struct io_ring_ctx *ctx, struct io_rsrc_node
 		io_rsrc_node_ref_zero(node);
 }
 
-static inline void io_charge_rsrc_node(struct io_ring_ctx *ctx,
-				       struct io_rsrc_node *node)
-{
-	node->refs++;
-}
-
 static inline void __io_req_set_rsrc_node(struct io_kiocb *req,
 					  struct io_ring_ctx *ctx)
 {
 	lockdep_assert_held(&ctx->uring_lock);
 	req->rsrc_node = ctx->rsrc_node;
-	io_charge_rsrc_node(ctx, ctx->rsrc_node);
+	ctx->rsrc_node->refs++;
 }
 
 static inline void io_req_set_rsrc_node(struct io_kiocb *req,

Original file line number	Diff line number	Diff line change
`@@ -97,18 +97,12 @@ static inline void io_put_rsrc_node(struct io_ring_ctx *ctx, struct io_rsrc_node`
`97`	`97`	`io_rsrc_node_ref_zero(node);`
`98`	`98`	`}`
`99`	`99`
`100`		`-static inline void io_charge_rsrc_node(struct io_ring_ctx *ctx,`
`101`		`- struct io_rsrc_node *node)`
`102`		`-{`
`103`		`- node->refs++;`
`104`		`-}`
`105`		`-`
`106`	`100`	`static inline void __io_req_set_rsrc_node(struct io_kiocb *req,`
`107`	`101`	`struct io_ring_ctx *ctx)`
`108`	`102`	`{`
`109`	`103`	`lockdep_assert_held(&ctx->uring_lock);`
`110`	`104`	`req->rsrc_node = ctx->rsrc_node;`
`111`		`- io_charge_rsrc_node(ctx, ctx->rsrc_node);`
	`105`	`+ ctx->rsrc_node->refs++;`
`112`	`106`	`}`
`113`	`107`
`114`	`108`	`static inline void io_req_set_rsrc_node(struct io_kiocb *req,`