Merge branch 'master' into gfio

[fio.git] / init.c

diff --git a/init.c b/init.c
index cf105a358824f0a7c0061108583ea48b5ae23b00..4f42a5cccf066eb441e6ca830d4400169fc3ad8a 100644 (file)
--- a/init.c
+++ b/init.c
@@ -23,8 +23,6 @@
 
 #include "lib/getopt.h"
 
-#include "fio_version.h"
-
 const char fio_version_string[] = FIO_VERSION;
 
 #define FIO_RANDSEED           (0xb1899bedUL)
@@ -40,7 +38,6 @@ struct thread_data *threads = NULL;
 int exitall_on_terminate = 0;
 int terse_output = 0;
 int eta_print;
-unsigned long long mlock_size = 0;
 FILE *f_out = NULL;
 FILE *f_err = NULL;
 char **job_sections = NULL;
@@ -843,14 +840,14 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num,
        if (setup_rate(td))
                goto err;
 
-       if (td->o.write_lat_log) {
+       if (td->o.lat_log_file) {
                setup_log(&td->lat_log, td->o.log_avg_msec, IO_LOG_TYPE_LAT);
                setup_log(&td->slat_log, td->o.log_avg_msec, IO_LOG_TYPE_SLAT);
                setup_log(&td->clat_log, td->o.log_avg_msec, IO_LOG_TYPE_CLAT);
        }
-       if (td->o.write_bw_log)
+       if (td->o.bw_log_file)
                setup_log(&td->bw_log, td->o.log_avg_msec, IO_LOG_TYPE_BW);
-       if (td->o.write_iops_log)
+       if (td->o.iops_log_file)
                setup_log(&td->iops_log, td->o.log_avg_msec, IO_LOG_TYPE_IOPS);
 
        if (!td->o.name)