t/zbd: avoid test case 31 failure with small devices

[fio.git] / io_u.h

diff --git a/io_u.h b/io_u.h
index ef6d0065c9efc71ac4d3f0805fe28fc327733b16..ab93d50f967e78547961e7650b2921f53f64f6b9 100644 (file)
--- a/io_u.h
+++ b/io_u.h
@@ -22,7 +22,6 @@ enum {
        IO_U_F_BARRIER          = 1 << 6,
        IO_U_F_VER_LIST         = 1 << 7,
        IO_U_F_PATTERN_DONE     = 1 << 8,
-       IO_U_F_OVERLAP_LOCK     = 1 << 9,
 };
 
 /*
@@ -53,6 +52,11 @@ struct io_u {
        unsigned short ioprio;
        unsigned short clat_prio_index;
 
+       /*
+        * number of trim ranges for this IO.
+        */
+       unsigned int number_trim;
+
        /*
         * Allocated/set buffer and length
         */
@@ -90,8 +94,8 @@ struct io_u {
        union {
                unsigned int index;
                unsigned int seen;
-               void *engine_data;
        };
+       void *engine_data;
 
        union {
                struct flist_head verify_list;
@@ -119,6 +123,9 @@ struct io_u {
         */
        int (*end_io)(struct thread_data *, struct io_u **);
 
+       uint32_t dtype;
+       uint32_t dspec;
+
        union {
 #ifdef CONFIG_LIBAIO
                struct iocb iocb;
@@ -160,7 +167,7 @@ void io_u_mark_submit(struct thread_data *, unsigned int);
 bool queue_full(const struct thread_data *);
 
 int do_io_u_sync(const struct thread_data *, struct io_u *);
-int do_io_u_trim(const struct thread_data *, struct io_u *);
+int do_io_u_trim(struct thread_data *, struct io_u *);
 
 #ifdef FIO_INC_DEBUG
 static inline void dprint_io_u(struct io_u *io_u, const char *p)