Merge branch 'master' into client-server
authorJens Axboe <axboe@kernel.dk>
Wed, 5 Oct 2011 07:55:28 +0000 (09:55 +0200)
committerJens Axboe <axboe@kernel.dk>
Wed, 5 Oct 2011 07:55:28 +0000 (09:55 +0200)
Conflicts:
init.c

Signed-off-by: Jens Axboe <axboe@kernel.dk>
1  2 
init.c

diff --cc init.c
--- 1/init.c
--- 2/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':
-                       def_thread.o.timeout = atoi(optarg);
 +                      fio_client_add_cmd_option(cur_client, argv[optind-1]);
+                       def_timeout = atoi(optarg);
                        break;
                case 'l':
 +                      fio_client_add_cmd_option(cur_client, argv[optind-1]);
                        write_lat_log = 1;
                        break;
                case 'b':