From: Jens Axboe <axboe@kernel.dk>
Date: Wed, 5 Oct 2011 07:55:28 +0000 (+0200)
Subject: Merge branch 'master' into client-server
X-Git-Tag: fio-1.99~6
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=d5e3a0c6f5376e0d76143edb2c1622efd77f995f

Merge branch 'master' into client-server

Conflicts:
	init.c

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

d5e3a0c6f5376e0d76143edb2c1622efd77f995f
diff --cc init.c
index 6066fc59,4eb0df2d..142a1637
--- a/init.c
+++ b/init.c
@@@ -1239,11 -1175,9 +1241,11 @@@ int parse_cmd_line(int argc, char *argv
  			smalloc_pool_size = atoi(optarg);
  			break;
  		case 't':
 +			fio_client_add_cmd_option(cur_client, argv[optind-1]);
- 			def_thread.o.timeout = atoi(optarg);
+ 			def_timeout = atoi(optarg);
  			break;
  		case 'l':
 +			fio_client_add_cmd_option(cur_client, argv[optind-1]);
  			write_lat_log = 1;
  			break;
  		case 'b':