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

[fio.git] / fio.c

diff --git a/fio.c b/fio.c
index 5ea1a2c32fc3d44edda83d910c8d11f8015cc1c9..2beda816bb43d3102c675c848d67794b6f0876ca 100644 (file)
--- a/fio.c
+++ b/fio.c
@@ -102,7 +102,7 @@ static void terminate_threads(int group_id)
                        /*
                         * if the thread is running, just let it exit
                         */
-                       if (td->runstate < TD_RUNNING)
+                       if (td->runstate < TD_RAMP)
                                kill(td->pid, SIGTERM);
                        else {
                                struct ioengine_ops *ops = td->io_ops;
@@ -1515,7 +1515,7 @@ static void run_threads(void)
        set_genesis_time();
 
        while (todo) {
-               struct thread_data *map[MAX_JOBS];
+               struct thread_data *map[REAL_MAX_JOBS];
                struct timeval this_start;
                int this_jobs = 0, left;