Warn more gently if the kernel is too old for io scheduler switching

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index e3478f582ac2c81405457546f6b8a15634521baa..bd975d82470ce4dc7bedb82a5f1cbd151e5574c1 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -8,7 +8,6 @@
 #include <sys/types.h>
 
 #include "fio.h"
-#include "os.h"
 
 static int extend_file(struct thread_data *td, struct fio_file *f)
 {
@@ -276,20 +275,29 @@ int open_files(struct thread_data *td)
 /*
  * open/close all files, so that ->real_file_size gets set
  */
-static void get_file_sizes(struct thread_data *td)
+static int get_file_sizes(struct thread_data *td)
 {
        struct fio_file *f;
        unsigned int i;
+       int err = 0;
 
        for_each_file(td, f, i) {
-               if (td->io_ops->open_file(td, f))
+               if (td->io_ops->open_file(td, f)) {
+                       if (td->error != ENOENT) {
+                               log_err("%s\n", td->verror);
+                               err = 1;
+                       }
                        clear_error(td);
-               else
-                       td->io_ops->close_file(td, f);
+               } else {
+                       if (td->io_ops->close_file)
+                               td->io_ops->close_file(td, f);
+               }
 
                if (f->real_file_size == -1ULL && td->o.size)
                        f->real_file_size = td->o.size / td->o.nr_files;
        }
+
+       return err;
 }
 
 /*
@@ -310,7 +318,7 @@ int setup_files(struct thread_data *td)
        if (td->io_ops->setup)
                err = td->io_ops->setup(td);
        else
-               get_file_sizes(td);
+               err = get_file_sizes(td);
 
        if (err)
                return err;
@@ -493,6 +501,12 @@ void add_file(struct thread_data *td, const char *fname)
        memset(f, 0, sizeof(*f));
        f->fd = -1;
 
+       /*
+        * init function, io engine may not be loaded yet
+        */
+       if (td->io_ops && (td->io_ops->flags & FIO_DISKLESSIO))
+               f->real_file_size = -1ULL;
+
        if (td->o.directory)
                len = sprintf(file_name, "%s/", td->o.directory);