Merge branch 'alignment' of https://github.com/sitsofe/fio

[fio.git] / file.h

diff --git a/file.h b/file.h
index c403b176827740f10afbc9dd6391b78c928b681d..9801bb584007558da4d7c2a17e78f50133c22fb6 100644 (file)
--- a/file.h
+++ b/file.h
@@ -113,9 +113,12 @@ struct fio_file {
        unsigned int last_write_idx;
 
        /*
-        * For use by the io engine
+        * For use by the io engine for offset or private data storage
         */
-       uint64_t engine_data;
+       union {
+               uint64_t engine_pos;
+               void *engine_data;
+       };
 
        /*
         * if io is protected by a semaphore, this is set
@@ -147,9 +150,8 @@ struct fio_file {
        struct disk_util *du;
 };
 
-#define FILE_ENG_DATA(f)       ((void *) (uintptr_t) (f)->engine_data)
-#define FILE_SET_ENG_DATA(f, data)     \
-       ((f)->engine_data = (uintptr_t) (data))
+#define FILE_ENG_DATA(f)               ((f)->engine_data)
+#define FILE_SET_ENG_DATA(f, data)     ((f)->engine_data = (data))
 
 #define FILE_FLAG_FNS(name)                                            \
 static inline void fio_file_set_##name(struct fio_file *f)             \