Merge branch 'master' into gfio

[fio.git] / fio.c

diff --git a/fio.c b/fio.c
index 52ed944a8b226b1fffe0cf38bc276ab012e42e31..9a6c31a65d912ba39a44f2cae1ce9ec8378146a6 100644 (file)
--- a/fio.c
+++ b/fio.c
@@ -36,7 +36,6 @@
 #include "memalign.h"
 #include "client.h"
 #include "server.h"
-#include "fio_initialization.h"
 
 int main(int argc, char *argv[], char *envp[])
 {
@@ -46,8 +45,10 @@ int main(int argc, char *argv[], char *envp[])
        if (parse_options(argc, argv))
                return 1;
 
-       if (nr_clients)
+       if (nr_clients) {
+               if (fio_start_all_clients())
+                       return 1;
                return fio_handle_clients(&fio_client_ops);
-       else
+       } else
                return fio_backend();
 }