From f635f1fbe188cf7284be4ba371761822e2e22a21 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Fri, 14 Dec 2018 13:07:55 -0700 Subject: [PATCH] engines/aioring: get rid of old error on sqwq and sqthread They are not mutually exclusive for buffered aio. Signed-off-by: Jens Axboe --- engines/aioring.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/engines/aioring.c b/engines/aioring.c index ce9a2aac..925b8862 100644 --- a/engines/aioring.c +++ b/engines/aioring.c @@ -480,7 +480,8 @@ static int fio_aioring_queue_init(struct thread_data *td) flags |= IOCTX_FLAG_SQTHREAD; if (o->sqthread_poll) flags |= IOCTX_FLAG_SQPOLL; - } else if (o->sqwq) + } + if (o->sqwq) flags |= IOCTX_FLAG_SQWQ; if (o->fixedbufs) { @@ -532,14 +533,8 @@ static int fio_aioring_post_init(struct thread_data *td) static int fio_aioring_init(struct thread_data *td) { - struct aioring_options *o = td->eo; struct aioring_data *ld; - if (o->sqthread_set && o->sqwq) { - log_err("fio: aioring sqthread and sqwq are mutually exclusive\n"); - return 1; - } - /* ring needs an extra entry, add one to achieve QD set */ td->o.iodepth++; -- 2.25.1