Commit b73de0da authored by Sidong Yang's avatar Sidong Yang Committed by Jens Axboe
Browse files

io_uring/rsrc: remove unused parameter ctx for io_rsrc_node_alloc() 



io_uring_ctx parameter for io_rsrc_node_alloc() is unused for now.
This patch removes the parameter and fixes the callers accordingly.

Signed-off-by: default avatarSidong Yang <sidong.yang@furiosa.ai>
Link: https://lore.kernel.org/r/20250115142033.658599-1-sidong.yang@furiosa.ai


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent bb2d7634

io_uring/filetable.c

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ static int io_install_fixed_file(struct io_ring_ctx *ctx, struct file *file, 
	if (slot_index >= ctx->file_table.data.nr)

		return -EINVAL;



	node = io_rsrc_node_alloc(ctx, IORING_RSRC_FILE);

	node = io_rsrc_node_alloc(IORING_RSRC_FILE);

	if (!node)

		return -ENOMEM;

io_uring/rsrc.c

+5 −5
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static void io_buffer_unmap(struct io_ring_ctx *ctx, struct io_rsrc_node *node) 
	}

}



struct io_rsrc_node *io_rsrc_node_alloc(struct io_ring_ctx *ctx, int type)

struct io_rsrc_node *io_rsrc_node_alloc(int type)

{

	struct io_rsrc_node *node;
@@ -203,7 +203,7 @@ static int __io_sqe_files_update(struct io_ring_ctx *ctx, 
				err = -EBADF;

				break;

			}

			node = io_rsrc_node_alloc(ctx, IORING_RSRC_FILE);

			node = io_rsrc_node_alloc(IORING_RSRC_FILE);

			if (!node) {

				err = -ENOMEM;

				fput(file);
@@ -525,7 +525,7 @@ int io_sqe_files_register(struct io_ring_ctx *ctx, void __user *arg, 
			goto fail;

		}

		ret = -ENOMEM;

		node = io_rsrc_node_alloc(ctx, IORING_RSRC_FILE);

		node = io_rsrc_node_alloc(IORING_RSRC_FILE);

		if (!node) {

			fput(file);

			goto fail;
@@ -730,7 +730,7 @@ static struct io_rsrc_node *io_sqe_buffer_register(struct io_ring_ctx *ctx, 
	if (!iov->iov_base)

		return NULL;



	node = io_rsrc_node_alloc(ctx, IORING_RSRC_BUFFER);

	node = io_rsrc_node_alloc(IORING_RSRC_BUFFER);

	if (!node)

		return ERR_PTR(-ENOMEM);

	node->buf = NULL;
@@ -1004,7 +1004,7 @@ static int io_clone_buffers(struct io_ring_ctx *ctx, struct io_ring_ctx *src_ctx 
		if (!src_node) {

			dst_node = NULL;

		} else {

			dst_node = io_rsrc_node_alloc(ctx, IORING_RSRC_BUFFER);

			dst_node = io_rsrc_node_alloc(IORING_RSRC_BUFFER);

			if (!dst_node) {

				ret = -ENOMEM;

				goto out_free;

io_uring/rsrc.h

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ struct io_imu_folio_data { 
	unsigned int	nr_folios;

};



struct io_rsrc_node *io_rsrc_node_alloc(struct io_ring_ctx *ctx, int type);

struct io_rsrc_node *io_rsrc_node_alloc(int type);

void io_free_rsrc_node(struct io_ring_ctx *ctx, struct io_rsrc_node *node);

void io_rsrc_data_free(struct io_ring_ctx *ctx, struct io_rsrc_data *data);

int io_rsrc_data_alloc(struct io_rsrc_data *data, unsigned nr);