X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=073ad4c370230c9f63eddf509ec73328fce8c9c2;hp=da2595c7aa29f905b89b41a34a52b8ce0918cd0c;hb=6b6fa9c83a4418b49f4a296b82f83bbecd8d59c4;hpb=097b2991ace8e069dbfb0c2286d31da714247573

diff --git a/init.c b/init.c
index da2595c7..073ad4c3 100644
--- 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.4";
 
 #define FIO_RANDSEED		(0xb1899bedUL)
 
@@ -655,10 +655,7 @@ static int fill_def_thread(void)
 {
 	memset(&def_thread, 0, sizeof(def_thread));
 
-	if (fio_getaffinity(getpid(), &def_thread.o.cpumask) == -1) {
-		perror("sched_getaffinity");
-		return 1;
-	}
+	fio_getaffinity(getpid(), &def_thread.o.cpumask);
 
 	/*
 	 * fill default options
@@ -669,10 +666,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 +783,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)