From: Jens Axboe <axboe@kernel.dk>
Date: Thu, 25 Jan 2018 17:28:23 +0000 (-0700)
Subject: io_ddir: revert separate ddir count change
X-Git-Tag: fio-3.4~13
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=092dfc6c778d8393256ac210b36ee3e5416080db

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 6adb7fb8..deaa8b5a 100644
--- 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,
 };