X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=init.c;h=b97c802b27c2e727423c9c3d30e8592ceb8317ff;hb=efcc4586d3c8974118fd66d53a09ffd739d77d11;hp=3d48467c8a488fa902788ffd60d2e8a67803c289;hpb=9bbf57cc80d915d8cc87240276334ddd5aaac547;p=fio.git

diff --git a/init.c b/init.c
index 3d48467c..b97c802b 100644
--- a/init.c
+++ b/init.c
@@ -21,7 +21,7 @@
 #include "verify.h"
 #include "profile.h"
 
-static char fio_version_string[] = "fio 1.37";
+static char fio_version_string[] = "fio 1.39";
 
 #define FIO_RANDSEED		(0xb1899bedUL)
 
@@ -360,9 +360,11 @@ static int fixup_options(struct thread_data *td)
 
 	if (o->verify != VERIFY_NONE) {
 		o->refill_buffers = 1;
-		if (o->max_bs[DDIR_WRITE] != o->min_bs[DDIR_WRITE] &&
-		    !o->verify_interval)
-			o->verify_interval = o->min_bs[DDIR_WRITE];
+		if (o->verify == VERIFY_META) {
+			if (o->max_bs[DDIR_WRITE] != o->min_bs[DDIR_WRITE] &&
+			    !o->verify_interval)
+				o->verify_interval = o->min_bs[DDIR_WRITE];
+		}
 	}
 
 	if (o->pre_read) {
@@ -776,6 +778,8 @@ static int parse_jobs_ini(char *file, int stonewall_flag)
 			break;
 		}
 
+		name[strlen(name) - 1] = '\0';
+
 		if (skip_this_section(name)) {
 			inside_skip = 1;
 			continue;
@@ -784,8 +788,6 @@ static int parse_jobs_ini(char *file, int stonewall_flag)
 
 		global = !strncmp(name, "global", 6);
 
-		name[strlen(name) - 1] = '\0';
-
 		if (dump_cmdline) {
 			if (first_sect)
 				log_info("fio ");
@@ -881,9 +883,6 @@ static int fill_def_thread(void)
 	fio_fill_default_options(&def_thread);
 
 	def_thread.o.timeout = def_timeout;
-	def_thread.o.write_bw_log = write_bw_log;
-	def_thread.o.write_lat_log = write_lat_log;
-
 	return 0;
 }
 
@@ -975,7 +974,8 @@ static void usage(const char *name)
 	printf("\t--section=name\tOnly run specified section in job file\n");
 	printf("\t--alloc-size=kb\tSet smalloc pool to this size in kb"
 		" (def 1024)\n");
-	printf("\nFio was written by Jens Axboe <jens.axboe@oracle.com>\n");
+	printf("\nFio was written by Jens Axboe <jens.axboe@oracle.com>");
+	printf("\n                   Jens Axboe <jaxboe@fusionio.com>\n");
 }
 
 #ifdef FIO_INC_DEBUG
@@ -992,6 +992,7 @@ struct debug_level debug_levels[] = {
 	{ .name = "job",	.shift = FD_JOB },
 	{ .name = "mutex",	.shift = FD_MUTEX },
 	{ .name	= "profile",	.shift = FD_PROFILE },
+	{ .name = "time",	.shift = FD_TIME },
 	{ .name = NULL, },
 };
 
@@ -1075,7 +1076,7 @@ static int parse_cmd_line(int argc, char *argv[])
 		case 'l':
 			write_lat_log = 1;
 			break;
-		case 'w':
+		case 'b':
 			write_bw_log = 1;
 			break;
 		case 'o':