io_ddir: revert separate ddir count change

This essentially reverts the previous commit. We need more
careful changes for looping and indexing, the easiest is just
to move the count values at the end as not to skew the values
of the actual ddir entries.

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/io_ddir.h b/io_ddir.h
index 6adb7fb8b3aefd11c2050473971d9782763eaf28..deaa8b5a3705e3c99e435a64b7b44da6c9b4574b 100644 (file)
--- a/io_ddir.h
+++ b/io_ddir.h
@@ -6,15 +6,12 @@ enum fio_ddir {
        DDIR_WRITE = 1,
        DDIR_TRIM = 2,
        DDIR_SYNC = 3,
-
        DDIR_DATASYNC,
        DDIR_SYNC_FILE_RANGE,
        DDIR_WAIT,
        DDIR_LAST,
        DDIR_INVAL = -1,
-};
 
-enum {
        DDIR_RWDIR_CNT = 3,
        DDIR_RWDIR_SYNC_CNT = 4,
 };