Merge branch 'master' into gfio
Conflicts:
Makefile
backend.c
client.c
fio.h
init.c
io_ddir.h
options.c
server.h
stat.c
stat.h
Signed-off-by: Jens Axboe <axboe@kernel.dk>
diff --git a/thread_options.h b/thread_options.h
index a78684c..323dacd 100644
--- a/thread_options.h
+++ b/thread_options.h
@@ -61,12 +61,12 @@
unsigned long long file_size_high;
unsigned long long start_offset;
- unsigned int bs[2];
- unsigned int ba[2];
- unsigned int min_bs[2];
- unsigned int max_bs[2];
- struct bssplit *bssplit[2];
- unsigned int bssplit_nr[2];
+ unsigned int bs[DDIR_RWDIR_CNT];
+ unsigned int ba[DDIR_RWDIR_CNT];
+ unsigned int min_bs[DDIR_RWDIR_CNT];
+ unsigned int max_bs[DDIR_RWDIR_CNT];
+ struct bssplit *bssplit[DDIR_RWDIR_CNT];
+ unsigned int bssplit_nr[DDIR_RWDIR_CNT];
unsigned int nr_files;
unsigned int open_files;
@@ -181,11 +181,11 @@
char *exec_prerun;
char *exec_postrun;
- unsigned int rate[2];
- unsigned int ratemin[2];
+ unsigned int rate[DDIR_RWDIR_CNT];
+ unsigned int ratemin[DDIR_RWDIR_CNT];
unsigned int ratecycle;
- unsigned int rate_iops[2];
- unsigned int rate_iops_min[2];
+ unsigned int rate_iops[DDIR_RWDIR_CNT];
+ unsigned int rate_iops_min[DDIR_RWDIR_CNT];
char *ioscheduler;