Merge branch 'fix-init-read-iolog' of https://github.com/aclamk/fio
authorJens Axboe <axboe@kernel.dk>
Fri, 19 Oct 2018 17:06:51 +0000 (11:06 -0600)
committerJens Axboe <axboe@kernel.dk>
Fri, 19 Oct 2018 17:06:51 +0000 (11:06 -0600)
* 'fix-init-read-iolog' of https://github.com/aclamk/fio:
  iolog: Fix problem with setup() not invoked when read_iolog is used.

filesetup.c

index c0fa3cdae882b0a738dce77c07a585616c31e937..457d4c1223394969347ff4c56fbc6b73700f6b6b 100644 (file)
@@ -908,9 +908,6 @@ int setup_files(struct thread_data *td)
 
        old_state = td_bump_runstate(td, TD_SETTING_UP);
 
-       if (o->read_iolog_file)
-               goto done;
-
        /*
         * Find out physical size of files or devices for this thread,
         * before we determine I/O size and range of our targets.
@@ -926,6 +923,9 @@ int setup_files(struct thread_data *td)
        if (err)
                goto err_out;
 
+       if (o->read_iolog_file)
+               goto done;
+       
        /*
         * check sizes. if the files/devices do not exist and the size
         * isn't passed to fio, abort.