Merge branch 'gfio' of ssh://brick.kernel.dk/data/git/fio into gfio

diff --combined init.c
index 8c9faec22f2cb5a67150d1264d600be1cdf709a9,7bddcea4b88bcd217e343267a45c4e0f1c7a7a26..261e02e1fb673ee8db30e0b7eff34843dda03a67
--- 1/init.c
--- 2/init.c
+++ b/init.c
@@@ -775,6 -775,11 +775,6 @@@ static int add_job(struct thread_data *
        if (ioengine_load(td))
                goto err;
  
 -      if (td->o.use_thread)
 -              nr_thread++;
 -      else
 -              nr_process++;
 -
        if (td->o.odirect)
                td->io_ops->flags |= FIO_RAWIO;
  
@@@ -860,12 -865,7 +860,7 @@@
                        if (is_backend && !recursed)
                                fio_server_send_add_job(td);
  
-                       if (!strcmp(td->io_ops->name, "cpuio")) {
-                               log_info("%s: ioengine=cpu, cpuload=%u,"
-                                        " cpucycle=%u\n", td->o.name,
-                                                       td->o.cpuload,
-                                                       td->o.cpucycle);
-                       } else {
+                       if (!(td->io_ops->flags & FIO_NOIO)) {
                                char *c1, *c2, *c3, *c4;
  
                                c1 = fio_uint_to_kmg(td->o.min_bs[DDIR_READ]);
@@@ -1703,3 -1703,8 +1698,8 @@@ int parse_options(int argc, char *argv[
  
        return 0;
  }
+ 
+ void options_default_fill(struct thread_options *o)
+ {
+       memcpy(o, &def_thread.o, sizeof(*o));
+ }