superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

io_uring: remove extra args from io_register_free_rings 

io_register_free_rings() doesn't use its "struct io_uring_params"
parameter, remove it.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Reviewed-by: Gabriel Krisman Bertazi <krisman@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
pull/1354/merge
Pavel Begunkov 2025-10-16 14:23:20 +01:00 committed by Jens Axboe
parent 4c53e392a1
commit 0c89dbbcad
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
io_uring/register.c
View File

@ -379,7 +379,6 @@ struct io_ring_ctx_rings {
}; };
static void io_register_free_rings(struct io_ring_ctx *ctx, static void io_register_free_rings(struct io_ring_ctx *ctx,
struct io_uring_params *p,
struct io_ring_ctx_rings *r) struct io_ring_ctx_rings *r)
{ {
io_free_region(ctx, &r->sq_region); io_free_region(ctx, &r->sq_region);
@ -434,7 +433,7 @@ static int io_register_resize_rings(struct io_ring_ctx *ctx, void __user *arg)
} }
ret = io_create_region(ctx, &n.ring_region, &rd, IORING_OFF_CQ_RING); ret = io_create_region(ctx, &n.ring_region, &rd, IORING_OFF_CQ_RING);
if (ret) { if (ret) {
io_register_free_rings(ctx, &p, &n); io_register_free_rings(ctx, &n);
return ret; return ret;
} }
n.rings = io_region_get_ptr(&n.ring_region); n.rings = io_region_get_ptr(&n.ring_region);
@ -453,7 +452,7 @@ static int io_register_resize_rings(struct io_ring_ctx *ctx, void __user *arg)
WRITE_ONCE(n.rings->cq_ring_entries, p.cq_entries); WRITE_ONCE(n.rings->cq_ring_entries, p.cq_entries);
if (copy_to_user(arg, &p, sizeof(p))) { if (copy_to_user(arg, &p, sizeof(p))) {
io_register_free_rings(ctx, &p, &n); io_register_free_rings(ctx, &n);
return -EFAULT; return -EFAULT;
} }
@ -462,7 +461,7 @@ static int io_register_resize_rings(struct io_ring_ctx *ctx, void __user *arg)
else else
size = array_size(sizeof(struct io_uring_sqe), p.sq_entries); size = array_size(sizeof(struct io_uring_sqe), p.sq_entries);
if (size == SIZE_MAX) { if (size == SIZE_MAX) {
io_register_free_rings(ctx, &p, &n); io_register_free_rings(ctx, &n);
return -EOVERFLOW; return -EOVERFLOW;
} }
@ -474,7 +473,7 @@ static int io_register_resize_rings(struct io_ring_ctx *ctx, void __user *arg)
} }
ret = io_create_region(ctx, &n.sq_region, &rd, IORING_OFF_SQES); ret = io_create_region(ctx, &n.sq_region, &rd, IORING_OFF_SQES);
if (ret) { if (ret) {
io_register_free_rings(ctx, &p, &n); io_register_free_rings(ctx, &n);
return ret; return ret;
} }
n.sq_sqes = io_region_get_ptr(&n.sq_region); n.sq_sqes = io_region_get_ptr(&n.sq_region);
@ -564,7 +563,7 @@ overflow:
out: out:
spin_unlock(&ctx->completion_lock); spin_unlock(&ctx->completion_lock);
mutex_unlock(&ctx->mmap_lock); mutex_unlock(&ctx->mmap_lock);
io_register_free_rings(ctx, &p, to_free); io_register_free_rings(ctx, to_free);
if (ctx->sq_data) if (ctx->sq_data)
io_sq_thread_unpark(ctx->sq_data); io_sq_thread_unpark(ctx->sq_data);