X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=4f15a2ea1c7bc24d1d0fcf4f40f09edb94fa3ea2;hp=1e4432ec7131f4f4e850761a9475bf914be3b05a;hb=b753feb720a8f0b1fbb692f915b7878e74e69ae2;hpb=0a839f308177e95c4c45c41ee1d4fa2b8f231f24

diff --git a/init.c b/init.c
index 1e4432ec..4f15a2ea 100644
--- a/init.c
+++ b/init.c
@@ -17,7 +17,7 @@
 #include "fio.h"
 #include "parse.h"
 
-static char fio_version_string[] = "fio 1.16";
+static char fio_version_string[] = "fio 1.17";
 
 #define FIO_RANDSEED		(0xb1899bedUL)
 
@@ -222,9 +222,6 @@ static int fixup_options(struct thread_data *td)
 	if (!o->file_size_high)
 		o->file_size_high = o->file_size_low;
 
-	if (td_read(td) && !td_rw(td))
-		o->verify = 0;
-
 	if (o->norandommap && o->verify != VERIFY_NONE) {
 		log_err("fio: norandommap given, verify disabled\n");
 		o->verify = VERIFY_NONE;
@@ -564,8 +561,12 @@ static int parse_jobs_ini(char *file, int stonewall_flag)
 	}
 
 	string = malloc(4096);
-	name = malloc(256);
-	memset(name, 0, 256);
+
+	/*
+	 * it's really 256 + small bit, 280 should suffice
+	 */
+	name = malloc(280);
+	memset(name, 0, 280);
 
 	stonewall = stonewall_flag;
 	do {
@@ -579,8 +580,8 @@ static int parse_jobs_ini(char *file, int stonewall_flag)
 		if (is_empty_or_comment(p))
 			continue;
 		if (sscanf(p, "[%255s]", name) != 1) {
-			log_err("fio: option <%s> outside of job section\n", p);
-			continue;
+			log_err("fio: option <%s> outside of [] job section\n", p);
+			break;
 		}
 
 		global = !strncmp(name, "global", 6);
@@ -655,10 +656,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