Allow trim on any file type

[fio.git] / io_ddir.h

diff --git a/io_ddir.h b/io_ddir.h
index a23ea626be83d9877a3c670719e7b3ef160124a4..b16a6b9bade95ce0e0822b5728021d5fae149f7d 100644 (file)
--- a/io_ddir.h
+++ b/io_ddir.h
@@ -42,7 +42,7 @@ enum td_ddir {
 #define td_trim(td)            ((td)->o.td_ddir & TD_DDIR_TRIM)
 #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)->io_axmap)
+#define file_randommap(td, f)  (!(td)->o.norandommap && fio_file_axmap((f)))
 
 static inline int ddir_sync(enum fio_ddir ddir)
 {
@@ -57,15 +57,13 @@ static inline int ddir_rw(enum fio_ddir ddir)
 
 static inline const char *ddir_str(enum td_ddir ddir)
 {
-       const char *ddir_str[] = { NULL, "read", "write", "rw", NULL,
-                                  "randread", "randwrite", "randrw",
-                                  "trim", NULL, NULL, NULL, "randtrim" };
+       const char *__str[] = { NULL, "read", "write", "rw", NULL,
+                               "randread", "randwrite", "randrw",
+                               "trim", NULL, NULL, NULL, "randtrim" };
 
-       return ddir_str[ddir];
+       return __str[ddir];
 }
 
-#define ddir_trim(ddir) ((ddir) == DDIR_TRIM)
-
 #define ddir_rw_sum(arr)       \
        ((arr)[DDIR_READ] + (arr)[DDIR_WRITE] + (arr)[DDIR_TRIM])