From d50f94d761a5d9a34e03a86e512e19d88cbeaf06 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Wed, 30 Oct 2024 09:51:58 -0600 Subject: io_uring/rsrc: get rid of the empty node and dummy_ubuf The empty node was used as a placeholder for a sparse entry, but it didn't really solve any issues. The caller still has to check for whether it's the empty node or not, it may as well just check for a NULL return instead. The dummy_ubuf was used for a sparse buffer entry, but NULL will serve the same purpose there of ensuring an -EFAULT on attempted import. Just use NULL for a sparse node, regardless of whether or not it's a file or buffer resource. Signed-off-by: Jens Axboe --- io_uring/splice.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'io_uring/splice.c') diff --git a/io_uring/splice.c b/io_uring/splice.c index deeb8bb18651..e8ed15f4ea1a 100644 --- a/io_uring/splice.c +++ b/io_uring/splice.c @@ -35,7 +35,7 @@ static int __io_splice_prep(struct io_kiocb *req, if (unlikely(sp->flags & ~valid_flags)) return -EINVAL; sp->splice_fd_in = READ_ONCE(sqe->splice_fd_in); - sp->rsrc_node = rsrc_empty_node; + sp->rsrc_node = NULL; req->flags |= REQ_F_FORCE_ASYNC; return 0; } -- cgit v1.2.3