backend: Add configurable non fatal error list

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index c2840711bcbbce92103fb05f19e084fe45a7841d..9679c88d28245f287d64f13092a72631f7121fca 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -435,7 +435,7 @@ int generic_close_file(struct thread_data fio_unused *td, struct fio_file *f)
        return ret;
 }
 
-static int file_lookup_open(struct fio_file *f, int flags)
+int file_lookup_open(struct fio_file *f, int flags)
 {
        struct fio_file *__f;
        int from_hash;
@@ -766,8 +766,11 @@ int setup_files(struct thread_data *td)
 
                if (f->io_size == -1ULL)
                        total_size = -1ULL;
-               else
+               else {
+                        if (td->o.size_percent)
+                                f->io_size = (f->io_size * td->o.size_percent) / 100;
                        total_size += f->io_size;
+               }
 
                if (f->filetype == FIO_TYPE_FILE &&
                    (f->io_size + f->file_offset) > f->real_file_size &&
@@ -781,9 +784,6 @@ int setup_files(struct thread_data *td)
                }
        }
 
-       if (td->o.size_percent)
-               total_size = (total_size * td->o.size_percent) / 100;
-
        if (!td->o.size || td->o.size > total_size)
                td->o.size = total_size;
 
@@ -792,7 +792,7 @@ int setup_files(struct thread_data *td)
         */
        if (need_extend) {
                temp_stall_ts = 1;
-               if (!terse_output)
+               if (output_format == FIO_OUTPUT_NORMAL)
                        log_info("%s: Laying out IO file(s) (%u file(s) /"
                                 " %lluMB)\n", td->o.name, need_extend,
                                        extend_size >> 20);