Merge branch 'vsock' of https://github.com/MPinna/fio

[fio.git] / io_u.h

diff --git a/io_u.h b/io_u.h
index 6b4c3014bac4ff48765f1ea80bcf0063c7add53e..786251d5be92f08e12515c3051f3babed04137a6 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,
 };
 
 /*
@@ -90,8 +89,8 @@ struct io_u {
        union {
                unsigned int index;
                unsigned int seen;
-               void *engine_data;
        };
+       void *engine_data;
 
        union {
                struct flist_head verify_list;
@@ -163,7 +162,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)