summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2020-01-25 10:15:41 -0700
committerJens Axboe <axboe@kernel.dk>2020-01-25 10:15:41 -0700
commit17a431278321ac9214146116072887a8ce79af0a (patch)
tree80327f0d62647cb47ab65bc4a65ca07d9e59674c
parent5c0772a5b840f562206a40a548615c1a40e864aa (diff)
downloadliburing-17a431278321ac9214146116072887a8ce79af0a.tar.gz
liburing-17a431278321ac9214146116072887a8ce79af0a.tar.bz2
Rename io_uring_params 'id' to 'wq_id'
Matches the kernel change. Signed-off-by: Jens Axboe <axboe@kernel.dk>
-rw-r--r--src/include/liburing/io_uring.h2
-rw-r--r--test/shared-wq.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/include/liburing/io_uring.h b/src/include/liburing/io_uring.h
index b96141f..a2c9fe8 100644
--- a/src/include/liburing/io_uring.h
+++ b/src/include/liburing/io_uring.h
@@ -185,7 +185,7 @@ struct io_uring_params {
__u32 sq_thread_cpu;
__u32 sq_thread_idle;
__u32 features;
- __u32 id;
+ __u32 wq_id;
__u32 resv[3];
struct io_sqring_offsets sq_off;
struct io_cqring_offsets cq_off;
diff --git a/test/shared-wq.c b/test/shared-wq.c
index 957df80..7e913bb 100644
--- a/test/shared-wq.c
+++ b/test/shared-wq.c
@@ -17,7 +17,7 @@ static int test_attach_id_no_flag(void)
int ret;
memset(&p, 0, sizeof(p));
- p.id = 1;
+ p.wq_id = 1;
ret = io_uring_queue_init_params(1, &ring, &p);
if (ret != -EINVAL) {
fprintf(stderr, "Attach to one: %d\n", ret);
@@ -37,7 +37,7 @@ static int test_attach_zero(void)
memset(&p, 0, sizeof(p));
p.flags = IORING_SETUP_ATTACH_WQ;
- p.id = 0;
+ p.wq_id = 0;
ret = io_uring_queue_init_params(1, &ring, &p);
if (ret != -EINVAL) {
fprintf(stderr, "Attach to zero: %d\n", ret);
@@ -56,7 +56,7 @@ static int test_attach(struct io_uring_params *org)
memset(&p, 0, sizeof(p));
p.flags = IORING_SETUP_ATTACH_WQ;
- p.id = org->id;
+ p.wq_id = org->wq_id;
ret = io_uring_queue_init_params(1, &ring2, &p);
if (ret == -EINVAL) {
fprintf(stdout, "Sharing not supported, skipping\n");