Revert "Fix multithread issues when operating on a single shared file"

[fio.git] / io_u.h

diff --git a/io_u.h b/io_u.h
index e75993bd863a9f629e136bbcb2cec542377d1a19..206e24fee09ec955a05220203576a6e9c03220d3 100644 (file)
--- a/io_u.h
+++ b/io_u.h
@@ -11,9 +11,6 @@
 #ifdef CONFIG_LIBAIO
 #include <libaio.h>
 #endif
-#ifdef CONFIG_GUASI
-#include <guasi.h>
-#endif
 
 enum {
        IO_U_F_FREE             = 1 << 0,
@@ -48,11 +45,18 @@ struct io_u {
         */
        unsigned short numberio;
 
+       /*
+        * IO priority.
+        */
+       unsigned short ioprio;
+       unsigned short clat_prio_index;
+
        /*
         * Allocated/set buffer and length
         */
        unsigned long long buflen;
-       unsigned long long offset;
+       unsigned long long offset;      /* is really ->xfer_offset... */
+       unsigned long long verify_offset;       /* is really ->offset */
        void *buf;
 
        /*
@@ -92,7 +96,6 @@ struct io_u {
                struct workqueue_work work;
        };
 
-#ifdef CONFIG_LINUX_BLKZONED
        /*
         * ZBD mode zbd_queue_io callback: called after engine->queue operation
         * to advance a zone write pointer and eventually unlock the I/O zone.
@@ -100,14 +103,14 @@ struct io_u {
         * @success == true means that the I/O operation has been queued or
         * completed successfully.
         */
-       void (*zbd_queue_io)(struct io_u *, int q, bool success);
+       void (*zbd_queue_io)(struct thread_data *td, struct io_u *, int q,
+                            bool success);
 
        /*
         * ZBD mode zbd_put_io callback: called in after completion of an I/O
         * or commit of an async I/O to unlock the I/O target zone.
         */
-       void (*zbd_put_io)(const struct io_u *);
-#endif
+       void (*zbd_put_io)(struct thread_data *td, const struct io_u *);
 
        /*
         * Callback for io completion
@@ -124,9 +127,6 @@ struct io_u {
 #ifdef FIO_HAVE_SGIO
                struct sg_io_hdr hdr;
 #endif
-#ifdef CONFIG_GUASI
-               guasi_req_t greq;
-#endif
 #ifdef CONFIG_SOLARISAIO
                aio_result_t resultp;
 #endif