X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=fio.h;h=f0babafede7119fbda8200199e7d1f36b1b4c5a0;hb=135be493d843d4cae2966a35cbd22a3058ec8e4b;hp=82e2b62f62d8f16a48fc242790580de7a1b2dc46;hpb=92a0daf8163eaa8d117d1e6e4fdc11a8dddac2d2;p=fio.git

diff --git a/fio.h b/fio.h
index 82e2b62f..f0babafe 100644
--- a/fio.h
+++ b/fio.h
@@ -42,15 +42,11 @@ struct thread_data;
 #include "stat.h"
 #include "flow.h"
 
-#ifdef FIO_HAVE_GUASI
-#include <guasi.h>
-#endif
-
-#ifdef FIO_HAVE_SOLARISAIO
+#ifdef CONFIG_SOLARISAIO
 #include <sys/asynch.h>
 #endif
 
-#ifdef FIO_HAVE_LIBNUMA
+#ifdef CONFIG_LIBNUMA
 #include <linux/mempolicy.h>
 #include <numa.h>
 
@@ -68,7 +64,6 @@ enum {
 	RW_SEQ_IDENT,
 };
 
-
 enum {
 	TD_F_VER_BACKLOG	= 1,
 	TD_F_TRIM_BACKLOG	= 2,
@@ -278,6 +273,8 @@ struct thread_data {
 	struct flist_head trim_list;
 	unsigned long trim_entries;
 
+	struct flist_head next_rand_list;
+
 	/*
 	 * for fileservice, how often to switch to a new file
 	 */
@@ -414,8 +411,6 @@ static inline int should_fsync(struct thread_data *td)
 {
 	if (td->last_was_sync)
 		return 0;
-	if (td->o.odirect)
-		return 0;
 	if (td_write(td) || td_rw(td) || td->o.override_sync)
 		return 1;
 
@@ -558,7 +553,7 @@ static inline int __should_check_rate(struct thread_data *td,
 }
 
 static inline int should_check_rate(struct thread_data *td,
-				    unsigned long *bytes_done)
+				    uint64_t *bytes_done)
 {
 	int ret = 0;