From: Jens Axboe <axboe@kernel.dk>
Date: Tue, 11 Dec 2012 07:11:11 +0000 (+0100)
Subject: Merge branch 'master' into gfio
X-Git-Tag: fio-2.1~57^2~35
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=2a988d8bcb447eb098fc382835cc507587c6ba66;p=fio.git

Merge branch 'master' into gfio

Conflicts:
	fio.c

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

2a988d8bcb447eb098fc382835cc507587c6ba66
diff --cc backend.c
index d56c7d01,a71d768d..8bcb7a2c
--- a/backend.c
+++ b/backend.c
@@@ -1288,12 -1287,12 +1302,12 @@@ err
  		verify_async_exit(td);
  
  	close_and_free_files(td);
- 	close_ioengine(td);
  	cleanup_io_u(td);
+ 	close_ioengine(td);
  	cgroup_shutdown(td, &cgroup_mnt);
  
 -	if (td->o.cpumask_set) {
 -		int ret = fio_cpuset_exit(&td->o.cpumask);
 +	if (o->cpumask_set) {
 +		int ret = fio_cpuset_exit(&o->cpumask);
  
  		td_verror(td, ret, "fio_cpuset_exit");
  	}
diff --cc fio.c
index 9a6c31a6,f44273f4..16e18b21
--- a/fio.c
+++ b/fio.c
@@@ -45,10 -104,10 +45,12 @@@ int main(int argc, char *argv[], char *
  	if (parse_options(argc, argv))
  		return 1;
  
+ 	fio_time_init();
+ 
 -	if (nr_clients)
 -		return fio_handle_clients();
 -	else
 +	if (nr_clients) {
 +		if (fio_start_all_clients())
 +			return 1;
 +		return fio_handle_clients(&fio_client_ops);
 +	} else
  		return fio_backend();
  }