Merge branch 'master' into gfio
authorJens Axboe <axboe@kernel.dk>
Tue, 11 Dec 2012 07:11:11 +0000 (08:11 +0100)
committerJens Axboe <axboe@kernel.dk>
Tue, 11 Dec 2012 07:11:11 +0000 (08:11 +0100)
Conflicts:
fio.c

Signed-off-by: Jens Axboe <axboe@kernel.dk>
1  2 
HOWTO
backend.c
filesetup.c
fio.1
fio.c
fio.h
init.c
ioengine.h
options.c
parse.c

diff --cc HOWTO
Simple merge
diff --cc backend.c
+++ b/backend.c
                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
--- 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