[PATCH] Fixup io size on block devices

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index 57735a96dacffe0e798b733b64f7f2dd187d97b2..3f9bdb8333f989057529652eee34f5a6a0378116 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -8,24 +8,30 @@
 #include "fio.h"
 #include "os.h"
 
-static int create_file(struct thread_data *td, struct fio_file *f)
+/*
+ * Check if the file exists and it's large enough.
+ */
+static int file_ok(struct thread_data *td, struct fio_file *f)
 {
-       unsigned long long left;
-       unsigned int bs;
        struct stat st;
-       char *b;
-       int r;
 
        if (td->filetype != FIO_TYPE_FILE)
                return 0;
 
-       if (stat(f->file_name, &st) == -1) {
-               if (!td->create_file) {
-                       td_verror(td, ENOENT);
-                       return 1;
-               }
-       } else if (st.st_size >= (off_t) f->file_size)
-               return 0;
+       if (stat(f->file_name, &st) == -1)
+               return 1;
+       else if (st.st_size < (off_t) f->file_size)
+               return 1;
+
+       return 0;
+}
+
+static int create_file(struct thread_data *td, struct fio_file *f)
+{
+       unsigned long long left;
+       unsigned int bs;
+       char *b;
+       int r;
 
        f->fd = open(f->file_name, O_WRONLY | O_CREAT | O_TRUNC, 0644);
        if (f->fd < 0) {
@@ -80,19 +86,30 @@ err:
 static int create_files(struct thread_data *td)
 {
        struct fio_file *f;
-       int i, err;
+       int i, err, need_create;
 
        /*
         * unless specifically asked for overwrite, let normal io extend it
         */
        if (!td->overwrite) {
-               td->io_size = td->total_file_size;
                for_each_file(td, f, i)
                        f->file_size = td->total_file_size / td->nr_files;
 
                return 0;
        }
 
+       need_create = 0;
+       for_each_file(td, f, i) {
+               if (td->filetype == FIO_TYPE_FILE) {
+                       f->file_size = td->total_file_size / td->nr_files;
+                       need_create += file_ok(td, f);
+               } else
+                       td->total_file_size += f->file_size;
+       }
+
+       if (!need_create)
+               return 0;
+
        if (!td->total_file_size) {
                log_err("Need size for create\n");
                td_verror(td, EINVAL);
@@ -100,17 +117,18 @@ static int create_files(struct thread_data *td)
        }
 
        temp_stall_ts = 1;
-       fprintf(f_out, "%s: Laying out IO file(s) (%LuMiB)\n",
-                                       td->name, td->total_file_size >> 20);
+       fprintf(f_out, "%s: Laying out IO file(s) (%d x %LuMiB == %LuMiB)\n",
+                               td->name, td->nr_files,
+                               (td->total_file_size >> 20) / td->nr_files,
+                               td->total_file_size >> 20);
 
        err = 0;
        for_each_file(td, f, i) {
-               f->file_size = td->total_file_size / td->nr_files;
-               err = create_file(td, f);
-               if (err)
-                       break;
-
-               td->io_size += f->file_size;
+               if (file_ok(td, f)) {
+                       err = create_file(td, f);
+                       if (err)
+                               break;
+               }
        }
 
        temp_stall_ts = 0;
@@ -179,7 +197,6 @@ static int get_file_size(struct thread_data *td, struct fio_file *f)
                return 1;
        }
 
-       td->io_size += f->file_size;
        return 0;
 }
 
@@ -331,6 +348,7 @@ static int setup_file(struct thread_data *td, struct fio_file *f)
        if (get_file_size(td, f))
                return 1;
 
+       td->total_file_size += f->file_size;
        return 0;
 }
 
@@ -349,12 +367,17 @@ int setup_files(struct thread_data *td)
        if (create_files(td))
                return 1;
 
+       err = 0;
        for_each_file(td, f, i) {
                err = setup_file(td, f);
                if (err)
                        break;
        }
 
+       if (err)
+               return err;
+
+       td->io_size = td->total_file_size;
        if (td->io_size == 0) {
                log_err("%s: no io blocks\n", td->name);
                td_verror(td, EINVAL);