aioring: remove IOCB_FLAG_HIPRI

New API doesn't require the setting of this flag at runtime,
it's implied from the io context.

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

diff --git a/engines/aioring.c b/engines/aioring.c
index 88641a93813807799b36ef2436cd48919ea9e8d0..f836009d29013ba02dc41319d8bd5f4a9bfe1b0f 100644 (file)
--- a/engines/aioring.c
+++ b/engines/aioring.c
@@ -21,10 +21,6 @@
 
 #ifdef ARCH_HAVE_AIORING
 
-#ifndef IOCB_FLAG_HIPRI
-#define IOCB_FLAG_HIPRI        (1 << 2)
-#endif
-
 /*
  * io_setup2(2) flags
  */
@@ -193,7 +189,6 @@ static int fio_aioring_prep(struct thread_data *td, struct io_u *io_u)
 {
        struct aioring_data *ld = td->io_ops_data;
        struct fio_file *f = io_u->file;
-       struct aioring_options *o = td->eo;
        struct iocb *iocb;
 
        iocb = &ld->iocbs[io_u->index];
@@ -208,10 +203,7 @@ static int fio_aioring_prep(struct thread_data *td, struct io_u *io_u)
                iocb->u.c.buf = io_u->xfer_buf;
                iocb->u.c.nbytes = io_u->xfer_buflen;
                iocb->u.c.offset = io_u->offset;
-               if (o->hipri)
-                       iocb->u.c.flags |= IOCB_FLAG_HIPRI;
-               else
-                       iocb->u.c.flags = 0;
+               iocb->u.c.flags = 0;
        } else if (ddir_sync(io_u->ddir))
                io_prep_fsync(iocb, f->fd);
 
@@ -503,9 +495,6 @@ static int fio_aioring_post_init(struct thread_data *td)
                        iocb = &ld->iocbs[i];
                        iocb->u.c.buf = io_u->buf;
                        iocb->u.c.nbytes = td_max_bs(td);
-
-                       if (o->hipri)
-                               iocb->u.c.flags |= IOCB_FLAG_HIPRI;
                }
        }
 

diff --git a/t/aio-ring.c b/t/aio-ring.c
index 2fd7ac61c818d20933a9a59a3fe9085aa27af6dc..c0c5009e6ca63b68d7c7a5f59a03fdc8ed2c120d 100644 (file)
--- a/t/aio-ring.c
+++ b/t/aio-ring.c
@@ -22,8 +22,6 @@
 #include <pthread.h>
 #include <sched.h>
 
-#define IOCB_FLAG_HIPRI                (1 << 2)
-
 #define IOCTX_FLAG_IOPOLL      (1 << 0)
 #define IOCTX_FLAG_SCQRING     (1 << 1)        /* Use SQ/CQ rings */
 #define IOCTX_FLAG_FIXEDBUFS   (1 << 2)
@@ -133,8 +131,6 @@ static void init_io(struct submitter *s, int fd, struct iocb *iocb)
        iocb->aio_fildes = fd;
        iocb->aio_lio_opcode = IO_CMD_PREAD;
        iocb->u.c.offset = offset;
-       if (polled)
-               iocb->u.c.flags = IOCB_FLAG_HIPRI;
        if (!fixedbufs)
                iocb->u.c.nbytes = BS;
 }