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 62d048ead5065763262e3a02100c6680cbb10f2b..bd975d82470ce4dc7bedb82a5f1cbd151e5574c1 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -288,8 +288,10 @@ static int get_file_sizes(struct thread_data *td)
                                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;
@@ -499,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);