Don't proceed with error set when failed to pre-read files/devices

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index 9335dcd3f8dd4b2c38548ee23dbc7e56282caeb0..cd486eaa41186ec3668e22b687ec868962b2a571 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -235,7 +235,8 @@ static int pre_read_file(struct thread_data *td, struct fio_file *f)
        unsigned int bs;
        char *b;
 
-       if (td_ioengine_flagged(td, FIO_PIPEIO))
+       if (td_ioengine_flagged(td, FIO_PIPEIO) ||
+           td_ioengine_flagged(td, FIO_NOIO))
                return 0;
 
        if (!fio_file_open(f)) {
@@ -1118,10 +1119,11 @@ int pre_read_files(struct thread_data *td)
        dprint(FD_FILE, "pre_read files\n");
 
        for_each_file(td, f, i) {
-               pre_read_file(td, f);
+               if (pre_read_file(td, f))
+                       return -1;
        }
 
-       return 1;
+       return 0;
 }
 
 static int __init_rand_distribution(struct thread_data *td, struct fio_file *f)