X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=init.c;h=f8daa3b1fbc2ee88461cac13804e001257ec1b7e;hb=4cc829d1c86e1c7eab9e24ddec600bde1a541651;hp=9163e475eb6b844fe3ba8d04bfcf61a3a12b7f42;hpb=c223da83e253b0057bb029bf4fbb55a05844215c;p=fio.git

diff --git a/init.c b/init.c
index 9163e475..f8daa3b1 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.41.1";
 
 #define FIO_RANDSEED		(0xb1899bedUL)
 
@@ -776,6 +776,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 +786,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 +881,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 +972,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
@@ -1076,7 +1074,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':