io_uring/rsrc: avoid NULL check in io_put_rsrc_node()

Most callers of io_put_rsrc_node() already check that node is non-NULL:
- io_rsrc_data_free()
- io_sqe_buffer_register()
- io_reset_rsrc_node()
- io_req_put_rsrc_nodes() (REQ_F_BUF_NODE indicates non-NULL buf_node)

Only io_splice_cleanup() can call io_put_rsrc_node() with a NULL node.
So move the NULL check there.

Signed-off-by: Caleb Sander Mateos <csander@purestorage.com>
Link: https://lore.kernel.org/r/20250216225900.1075446-1-csander@purestorage.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/io_uring/rsrc.h b/io_uring/rsrc.h
index 190f7ee45de933b39a8c4d33dc86f687e338eb16..a6d883c62b2213a31586153b165e86cb22e5d28c 100644 (file)
--- a/io_uring/rsrc.h
+++ b/io_uring/rsrc.h
@@ -83,7 +83,7 @@ static inline struct io_rsrc_node *io_rsrc_node_lookup(struct io_rsrc_data *data
 static inline void io_put_rsrc_node(struct io_ring_ctx *ctx, struct io_rsrc_node *node)
 {
        lockdep_assert_held(&ctx->uring_lock);
-       if (node && !--node->refs)
+       if (!--node->refs)
                io_free_rsrc_node(ctx, node);
 }
 

diff --git a/io_uring/splice.c b/io_uring/splice.c
index 5b84f16306116e4d5cc85de3013a058f0030c623..7b89bd84d486d480787cbc551c575c927bd27cda 100644 (file)
--- a/io_uring/splice.c
+++ b/io_uring/splice.c
@@ -51,7 +51,8 @@ void io_splice_cleanup(struct io_kiocb *req)
 {
        struct io_splice *sp = io_kiocb_to_cmd(req, struct io_splice);
 
-       io_put_rsrc_node(req->ctx, sp->rsrc_node);
+       if (sp->rsrc_node)
+               io_put_rsrc_node(req->ctx, sp->rsrc_node);
 }
 
 static struct file *io_splice_get_file(struct io_kiocb *req,