io_uring: io_uring_setup(2) takes a 'nr_iovecs' field now

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/engines/io_uring.c b/engines/io_uring.c
index 475ead79cb8613e1b0c9ef6d823394338ccf134b..77b4686a6d1d6680203039aac0ed79a11573455d 100644 (file)
--- a/engines/io_uring.c
+++ b/engines/io_uring.c
@@ -474,7 +474,7 @@ static int fio_ioring_queue_init(struct thread_data *td)
                vecs = ld->iovecs;
        }
 
-       ret = syscall(__NR_sys_io_uring_setup, depth, vecs, &p);
+       ret = syscall(__NR_sys_io_uring_setup, depth, vecs, depth, &p);
        if (ret < 0)
                return ret;
 

diff --git a/t/io_uring.c b/t/io_uring.c
index 92227c748accc2aee19a7e3f6d19e60a3e22b928..76da6b292f03e2d21623b1d2f48f4bb88dfdb149 100644 (file)
--- a/t/io_uring.c
+++ b/t/io_uring.c
@@ -89,9 +89,9 @@ static int sq_thread = 0;     /* use kernel submission thread */
 static int sq_thread_cpu = 0;  /* pin above thread to this CPU */
 
 static int io_uring_setup(unsigned entries, struct iovec *iovecs,
-                         struct io_uring_params *p)
+                         unsigned nr_iovecs, struct io_uring_params *p)
 {
-       return syscall(__NR_sys_io_uring_setup, entries, iovecs, p);
+       return syscall(__NR_sys_io_uring_setup, entries, iovecs, nr_iovecs, p);
 }
 
 static int io_uring_enter(struct submitter *s, unsigned int to_submit,
@@ -323,9 +323,9 @@ static int setup_ring(struct submitter *s)
        }
 
        if (fixedbufs)
-               fd = io_uring_setup(DEPTH, s->iovecs, &p);
+               fd = io_uring_setup(DEPTH, s->iovecs, DEPTH, &p);
        else
-               fd = io_uring_setup(DEPTH, NULL, &p);
+               fd = io_uring_setup(DEPTH, NULL, 0, &p);
        if (fd < 0) {
                perror("io_uring_setup");
                return 1;