Merge branch 'master' into gfio
Conflicts:
engines/libaio.c
engines/net.c
iolog.h
options.c
options.h
parse.c
parse.h
thread_options.h
Signed-off-by: Jens Axboe <axboe@kernel.dk>
diff --git a/thread_options.h b/thread_options.h
index a794949..68056df 100644
--- a/thread_options.h
+++ b/thread_options.h
@@ -123,6 +123,7 @@
unsigned int fsync_on_close;
unsigned int random_distribution;
+
fio_fp64_t zipf_theta;
fio_fp64_t pareto_h;
@@ -150,7 +151,7 @@
enum fio_memtype mem_type;
unsigned int mem_align;
- unsigned max_latency;
+ unsigned int max_latency;
unsigned int stonewall;
unsigned int new_group;