Total file size handling fix

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index 919bdf49504eebdc4b69c1643bf128c9001cbac2..4a5a665ec0dd630fa42563be6752b3f634302d5c 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -101,8 +101,13 @@ static int create_files(struct thread_data *td)
        int err, need_create, can_extend;
        unsigned int i;
 
-       for_each_file(td, f, i)
-               f->file_size = td->total_file_size / td->nr_files;
+       for_each_file(td, f, i) {
+               if (f->filetype != FIO_TYPE_FILE)
+                       continue;
+
+               f->file_size = td->total_file_size / td->nr_normal_files;
+               f->file_offset = td->start_offset;
+       }
 
        /*
         * unless specifically asked for overwrite, let normal io extend it
@@ -139,8 +144,8 @@ static int create_files(struct thread_data *td)
 
        temp_stall_ts = 1;
        fprintf(f_out, "%s: Laying out IO file(s) (%u x %LuMiB == %LuMiB)\n",
-                               td->name, td->nr_uniq_files,
-                               (td->total_file_size >> 20) / td->nr_uniq_files,
+                               td->name, td->nr_normal_files,
+                               (td->total_file_size >> 20) / td->nr_normal_files,
                                td->total_file_size >> 20);
 
        err = 0;
@@ -370,8 +375,6 @@ int setup_files(struct thread_data *td)
        for_each_file(td, f, i)
                td->total_file_size += f->file_size;
 
-       td->total_file_size = (td->total_file_size * td->nr_files) / td->open_files;
-
        td->io_size = td->total_file_size;
        if (td->io_size == 0) {
                log_err("%s: no io blocks\n", td->name);
@@ -431,7 +434,7 @@ static void get_file_type(struct fio_file *f)
 
 void add_file(struct thread_data *td, const char *fname)
 {
-       int cur_files = td->open_files;
+       int cur_files = td->files_index;
        struct fio_file *f;
 
        td->files = realloc(td->files, (cur_files + 1) * sizeof(*f));
@@ -443,8 +446,9 @@ void add_file(struct thread_data *td, const char *fname)
 
        get_file_type(f);
 
-       td->open_files++;
-       td->nr_uniq_files = td->open_files;
+       td->files_index++;
+       if (f->filetype == FIO_TYPE_FILE)
+               td->nr_normal_files++;
 }
 
 void get_file(struct fio_file *f)