Move td_* ddir defines

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

diff --git a/fio.h b/fio.h
index 771df35412ea787382b5963086fc9d6466ddf56d..7a4b9c69fbe3b94dc62a8a828f2238ebc493c6ea 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -413,12 +413,6 @@ extern int fio_gtod_cpu;
 
 extern struct thread_data *threads;
 
-#define td_read(td)            ((td)->o.td_ddir & TD_DDIR_READ)
-#define td_write(td)           ((td)->o.td_ddir & TD_DDIR_WRITE)
-#define td_rw(td)              (((td)->o.td_ddir & TD_DDIR_RW) == TD_DDIR_RW)
-#define td_random(td)          ((td)->o.td_ddir & TD_DDIR_RAND)
-#define file_randommap(td, f)  (!(td)->o.norandommap && (f)->file_map)
-
 static inline void fio_ro_check(struct thread_data *td, struct io_u *io_u)
 {
        assert(!(io_u->ddir == DDIR_WRITE && !td_write(td)));

diff --git a/io_ddir.h b/io_ddir.h
index 3d9a2050dfdc58db6e82ebaade22f79624ea957a..d2ee40ceefa5db7aaf93f10bacd6c0c29e6dc7ad 100644 (file)
--- a/io_ddir.h
+++ b/io_ddir.h
@@ -18,4 +18,10 @@ enum td_ddir {
        TD_DDIR_RANDRW          = TD_DDIR_RW | TD_DDIR_RAND,
 };
 
+#define td_read(td)            ((td)->o.td_ddir & TD_DDIR_READ)
+#define td_write(td)           ((td)->o.td_ddir & TD_DDIR_WRITE)
+#define td_rw(td)              (((td)->o.td_ddir & TD_DDIR_RW) == TD_DDIR_RW)
+#define td_random(td)          ((td)->o.td_ddir & TD_DDIR_RAND)
+#define file_randommap(td, f)  (!(td)->o.norandommap && (f)->file_map)
+
 #endif