Fix cpumask setting/getting on older kernels

[fio.git] / fio.h

diff --git a/fio.h b/fio.h
index fa0edb1ed02938899776f397aa97b446ad7052e1..9a43c6f65edc05c64a5f3e3d6879b7599c068de7 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -15,6 +15,7 @@
 
 #include "compiler/compiler.h"
 #include "list.h"
+#include "fifo.h"
 #include "rbtree.h"
 #include "md5.h"
 #include "crc32.h"
@@ -267,6 +268,7 @@ struct fio_file {
         */
        char *file_name;
        void *mmap;
+       unsigned int major, minor;
 
        /*
         * size of the file, offset into file, and io size from that offset
@@ -392,7 +394,7 @@ struct thread_options {
        unsigned int thinktime_blocks;
        unsigned int fsync_blocks;
        unsigned int start_delay;
-       unsigned long timeout;
+       unsigned long long timeout;
        unsigned int overwrite;
        unsigned int bw_avg_time;
        unsigned int loops;
@@ -404,6 +406,7 @@ struct thread_options {
        unsigned int new_group;
        unsigned int numjobs;
        os_cpu_mask_t cpumask;
+       unsigned int cpumask_set;
        unsigned int iolog;
        unsigned int rwmixcycle;
        unsigned int rwmix[2];
@@ -665,13 +668,6 @@ struct disk_util {
 
 #define DISK_UTIL_MSEC (250)
 
-#ifndef min
-#define min(a, b)      ((a) < (b) ? (a) : (b))
-#endif
-#ifndef max
-#define max(a, b)      ((a) > (b) ? (a) : (b))
-#endif
-
 /*
  * Log exports
  */