Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
authored by
Pavel Begunkov
and committed by
Jens Axboe
0c89dbbc
4c53e392
+5
-6
+5
-6
io_uring/register.c
+5
-6
io_uring/register.c
···
379
379
};
380
380
381
381
static void io_register_free_rings(struct io_ring_ctx *ctx,
382
-
struct io_uring_params *p,
383
382
struct io_ring_ctx_rings *r)
384
383
{
385
384
io_free_region(ctx, &r->sq_region);
···
433
434
}
434
435
ret = io_create_region(ctx, &n.ring_region, &rd, IORING_OFF_CQ_RING);
435
436
if (ret) {
436
-
io_register_free_rings(ctx, &p, &n);
437
+
io_register_free_rings(ctx, &n);
437
438
return ret;
438
439
}
439
440
n.rings = io_region_get_ptr(&n.ring_region);
···
452
453
WRITE_ONCE(n.rings->cq_ring_entries, p.cq_entries);
453
454
454
455
if (copy_to_user(arg, &p, sizeof(p))) {
455
-
io_register_free_rings(ctx, &p, &n);
456
+
io_register_free_rings(ctx, &n);
456
457
return -EFAULT;
457
458
}
458
459
···
461
462
else
462
463
size = array_size(sizeof(struct io_uring_sqe), p.sq_entries);
463
464
if (size == SIZE_MAX) {
464
-
io_register_free_rings(ctx, &p, &n);
465
+
io_register_free_rings(ctx, &n);
465
466
return -EOVERFLOW;
466
467
}
467
468
···
473
474
}
474
475
ret = io_create_region(ctx, &n.sq_region, &rd, IORING_OFF_SQES);
475
476
if (ret) {
476
-
io_register_free_rings(ctx, &p, &n);
477
+
io_register_free_rings(ctx, &n);
477
478
return ret;
478
479
}
479
480
n.sq_sqes = io_region_get_ptr(&n.sq_region);
···
563
564
out:
564
565
spin_unlock(&ctx->completion_lock);
565
566
mutex_unlock(&ctx->mmap_lock);
566
-
io_register_free_rings(ctx, &p, to_free);
567
+
io_register_free_rings(ctx, to_free);
567
568
568
569
if (ctx->sq_data)
569
570
io_sq_thread_unpark(ctx->sq_data);