t/zbd: Fix a bug in max_open_zones()

[fio.git] / engines / io_uring.c

diff --git a/engines/io_uring.c b/engines/io_uring.c
index 5e59f975c3c529ab735961763c49270ec63eb111..ac57af8f0b1c2479b665db7266ae4c4b6d45e4ca 100644 (file)
--- a/engines/io_uring.c
+++ b/engines/io_uring.c
@@ -63,6 +63,8 @@ struct ioring_data {
        int queued;
        int cq_ring_off;
        unsigned iodepth;
+       bool ioprio_class_set;
+       bool ioprio_set;
 
        struct ioring_mmap mmap[3];
 };
@@ -233,9 +235,9 @@ static int fio_ioring_prep(struct thread_data *td, struct io_u *io_u)
                }
                if (!td->o.odirect && o->uncached)
                        sqe->rw_flags = RWF_UNCACHED;
-               if (fio_option_is_set(&td->o, ioprio_class))
+               if (ld->ioprio_class_set)
                        sqe->ioprio = td->o.ioprio_class << 13;
-               if (fio_option_is_set(&td->o, ioprio))
+               if (ld->ioprio_set)
                        sqe->ioprio |= td->o.ioprio;
                sqe->off = io_u->offset;
        } else if (ddir_sync(io_u->ddir)) {
@@ -374,8 +376,6 @@ static enum fio_q_status fio_ioring_queue(struct thread_data *td,
        if (next_tail == *ring->head)
                return FIO_Q_BUSY;
 
-       /* ensure sqe stores are ordered with tail update */
-       write_barrier();
        if (o->cmdprio_percentage)
                fio_ioring_prio_prep(td, io_u);
        ring->array[tail & ld->sq_ring_mask] = io_u->index;
@@ -687,6 +687,12 @@ static int fio_ioring_init(struct thread_data *td)
                td_verror(td, EINVAL, "fio_io_uring_init");
                return 1;
        }
+
+       if (fio_option_is_set(&td->o, ioprio_class))
+               ld->ioprio_class_set = true;
+       if (fio_option_is_set(&td->o, ioprio))
+               ld->ioprio_set = true;
+
        return 0;
 }