Merge branch 'master' into gfio

Conflicts:
	fio.c

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

diff --cc HOWTO
Simple merge

diff --cc backend.c
index d56c7d017333340281b05419f533ec232d2ee9c4,a71d768d22d89437e4a6cde828c24c36bb28ecbf..8bcb7a2c50b4e9e5f84915f827535bf8b0c62d54
--- 1/backend.c
--- 2/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 filesetup.c
Simple merge

diff --cc fio.1
Simple merge

diff --cc fio.c
index 9a6c31a65d912ba39a44f2cae1ce9ec8378146a6,f44273f483c59103ece4a3d4681496e663698f66..16e18b211b910f3db2a0b036c7918490745e8919
--- 1/fio.c
--- 2/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;
  
 -      if (nr_clients)
 -              return fio_handle_clients();
 -      else
+       fio_time_init();
+ 
 +      if (nr_clients) {
 +              if (fio_start_all_clients())
 +                      return 1;
 +              return fio_handle_clients(&fio_client_ops);
 +      } else
                return fio_backend();
  }

diff --cc fio.h
Simple merge

diff --cc init.c
Simple merge

diff --cc ioengine.h
Simple merge

diff --cc options.c
Simple merge

diff --cc parse.c
Simple merge