engines/libaio: fix new aio poll API

[fio.git] / engines / libaio.c

diff --git a/engines/libaio.c b/engines/libaio.c
index da7f0c3ee7555bc4ef08bee90e405e0c4dd90acf..2a4d653467849e0d764c8a0c279e15264f13c690 100644 (file)
--- a/engines/libaio.c
+++ b/engines/libaio.c
@@ -361,7 +361,7 @@ static int fio_libaio_queue_init(struct libaio_data *ld, unsigned int depth,
                                 bool hipri)
 {
 #ifdef __NR_sys_io_setup2
-       int err, flags = 0;
+       int flags = 0;
 
        if (hipri)
                flags = IOCTX_FLAG_IOPOLL;
@@ -389,10 +389,7 @@ static int fio_libaio_init(struct thread_data *td)
         * care about the user ring. If that fails, the kernel is too old
         * and we need the right depth.
         */
-       if (!o->userspace_reap)
-               err = fio_libaio_queue_init(ld, INT_MAX, o->hipri);
-       if (o->userspace_reap || err == -EINVAL)
-               err = fio_libaio_queue_init(ld, td->o.iodepth, o->hipri);
+       err = fio_libaio_queue_init(ld, td->o.iodepth, o->hipri);
        if (err) {
                td_verror(td, -err, "io_queue_init");
                log_err("fio: check /proc/sys/fs/aio-max-nr\n");