X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=filesetup.c;h=4beb06e369c5061a364ed052d791c73fa2a99057;hp=919bdf49504eebdc4b69c1643bf128c9001cbac2;hb=1549441cdfecb2c1a4a8b8d494253859d67b4344;hpb=1315a68a091816d284c5f46b28e419349aa821d8 diff --git a/filesetup.c b/filesetup.c index 919bdf49..4beb06e3 100644 --- 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; @@ -444,7 +449,8 @@ void add_file(struct thread_data *td, const char *fname) get_file_type(f); td->open_files++; - td->nr_uniq_files = td->open_files; + if (f->filetype == FIO_TYPE_FILE) + td->nr_normal_files++; } void get_file(struct fio_file *f)