Merge branch 'master' into gfio

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index 166ace8c529e02d0afa5cc91fb4ca66d6626cd21..76e142af88972748f8ac96df047d7fd68ffd4cee 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -526,6 +526,11 @@ open_again:
 
                snprintf(buf, sizeof(buf) - 1, "open(%s)", f->file_name);
 
+               if (__e == EINVAL && (flags & OS_O_DIRECT)) {
+                       log_err("fio: looks like your file system does not " \
+                               "support direct=1/buffered=0\n");
+               }
+
                td_verror(td, __e, buf);
        }
 
@@ -665,7 +670,7 @@ int setup_files(struct thread_data *td)
        dprint(FD_FILE, "setup files\n");
 
        if (td->o.read_iolog_file)
-               return 0;
+               goto done;
 
        /*
         * if ioengine defines a setup() method, it's responsible for
@@ -816,6 +821,11 @@ int setup_files(struct thread_data *td)
         */
        if (!td->o.read_iolog_file)
                td->total_io_size = td->o.size * td->o.loops;
+
+done:
+       if (td->o.create_only)
+               td->done = 1;
+
        return 0;
 err_offset:
        log_err("%s: you need to specify valid offset=\n", td->o.name);
@@ -969,6 +979,7 @@ int add_file(struct thread_data *td, const char *fname)
                td->files_size = new_size;
        }
        td->files[cur_files] = f;
+       f->fileno = cur_files;
 
        /*
         * init function, io engine may not be loaded yet