X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;ds=sidebyside;f=io_ddir.h;h=763e82659e3ce414827da9919a2339d32967f88c;hb=3e93fc256cb4156518ec9720cda0a3d9c777c6f8;hp=b0d79ff7e14bf03ffccf7d8ee2b651e880ccf394;hpb=0e4dd95c548cca2e7bef7db3696231130cb4b594;p=fio.git

diff --git a/io_ddir.h b/io_ddir.h
index b0d79ff7..763e8265 100644
--- a/io_ddir.h
+++ b/io_ddir.h
@@ -16,8 +16,9 @@ enum fio_ddir {
 
 static inline const char *io_ddir_name(enum fio_ddir ddir)
 {
-	const char *name[] = { "read", "write", "trim", "sync", "datasync",
-				"sync_file_range", "write", };
+	static const char *name[] = { "read", "write", "trim", "sync",
+					"datasync", "sync_file_range",
+					"wait", };
 
 	if (ddir < DDIR_LAST)
 		return name[ddir];
@@ -35,7 +36,7 @@ enum td_ddir {
 	TD_DDIR_RANDWRITE	= TD_DDIR_WRITE | TD_DDIR_RAND,
 	TD_DDIR_RANDRW		= TD_DDIR_RW | TD_DDIR_RAND,
 	TD_DDIR_RANDTRIM	= TD_DDIR_TRIM | TD_DDIR_RAND,
-	TD_DDIR_WRITETRIM	= TD_DDIR_TRIM | TD_DDIR_WRITE,
+	TD_DDIR_TRIMWRITE	= TD_DDIR_TRIM | TD_DDIR_WRITE,
 };
 
 #define td_read(td)		((td)->o.td_ddir & TD_DDIR_READ)
@@ -44,8 +45,8 @@ enum td_ddir {
 #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 && fio_file_axmap((f)))
-#define td_writetrim(td)	(((td)->o.td_ddir & TD_DDIR_WRITETRIM) \
-					== TD_DDIR_WRITETRIM)
+#define td_trimwrite(td)	(((td)->o.td_ddir & TD_DDIR_TRIMWRITE) \
+					== TD_DDIR_TRIMWRITE)
 
 static inline int ddir_sync(enum fio_ddir ddir)
 {