Disk stat improvements

[fio.git] / init.c

diff --git a/init.c b/init.c
index da2595c7aa29f905b89b41a34a52b8ce0918cd0c..1e4432ec7131f4f4e850761a9475bf914be3b05a 100644 (file)
--- a/init.c
+++ b/init.c
@@ -17,7 +17,7 @@
 #include "fio.h"
 #include "parse.h"
 
-static char fio_version_string[] = "fio 1.15.2";
+static char fio_version_string[] = "fio 1.16";
 
 #define FIO_RANDSEED           (0xb1899bedUL)
 
@@ -669,10 +669,6 @@ static int fill_def_thread(void)
        def_thread.o.write_bw_log = write_bw_log;
        def_thread.o.write_lat_log = write_lat_log;
 
-#ifdef FIO_HAVE_DISK_UTIL
-       def_thread.o.do_disk_util = 1;
-#endif
-
        return 0;
 }
 
@@ -790,7 +786,11 @@ static int parse_cmd_line(int argc, char *argv[])
                                td = NULL;
                        }
                        if (!td) {
-                               int global = !strncmp(val, "global", 6);
+                               int global = 0;
+
+                               if (strncmp(opt, "name", 4) ||
+                                   !strncmp(val, "global", 6))
+                                       global = 1;
 
                                td = get_new_job(global, &def_thread);
                                if (!td)