From: Jens Axboe <jaxboe@fusionio.com>
Date: Sat, 23 Jul 2011 11:43:13 +0000 (+0200)
Subject: Fix --timeout as global parameter
X-Git-Tag: fio-1.58~43
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=ab2cabdb2c67d8b90c94c1a95f7a2286a0f818b9;hp=0b7fdba72ade6f642cc0bf86023a42a408544599

Fix --timeout as global parameter

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
---

diff --git a/init.c b/init.c
index 85bd0f73..98e10f7d 100644
--- a/init.c
+++ b/init.c
@@ -47,7 +47,6 @@ int warnings_fatal = 0;
 int write_bw_log = 0;
 int read_only = 0;
 
-static int def_timeout;
 static int write_lat_log;
 
 static int prev_group_jobs;
@@ -951,8 +950,6 @@ static int fill_def_thread(void)
 	 * fill default options
 	 */
 	fio_fill_default_options(&def_thread);
-
-	def_thread.o.timeout = def_timeout;
 	return 0;
 }
 
@@ -1160,7 +1157,7 @@ static int parse_cmd_line(int argc, char *argv[])
 			smalloc_pool_size = atoi(optarg);
 			break;
 		case 't':
-			def_timeout = atoi(optarg);
+			def_thread.o.timeout = atoi(optarg);
 			break;
 		case 'l':
 			write_lat_log = 1;