engines/aioring: get rid of old error on sqwq and sqthread

They are not mutually exclusive for buffered aio.

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

diff --git a/engines/aioring.c b/engines/aioring.c
index ce9a2aac6ce2b865b91ad0565453d55a4cca7504..925b88620274115b540d32aa7dca0ba31d8bd6f2 100644 (file)
--- 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++;