X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=filesetup.c;h=012773b95eba7ff27c714e7a5085f15a939c0fb7;hb=eec97b935abb714bf498c96a8f18ec1104c75fd4;hp=9c37ae57e24af13cc411a8f3f8398e06f5963626;hpb=c465cd14ca958dfdb87bb1998add722d62ae3691;p=fio.git

diff --git a/filesetup.c b/filesetup.c
index 9c37ae57..012773b9 100644
--- a/filesetup.c
+++ b/filesetup.c
@@ -894,8 +894,10 @@ int setup_files(struct thread_data *td)
 		if (f->io_size == -1ULL)
 			total_size = -1ULL;
 		else {
-                        if (o->size_percent)
-                                f->io_size = (f->io_size * o->size_percent) / 100;
+                        if (o->size_percent) {
+				f->io_size = (f->io_size * o->size_percent) / 100;
+				f->io_size -= (f->io_size % td_min_bs(td));
+			}
 			total_size += f->io_size;
 		}
 
@@ -1333,7 +1335,8 @@ int add_file(struct thread_data *td, const char *fname, int numjob, int inc)
 	dprint(FD_FILE, "add file %s\n", fname);
 
 	if (td->o.directory)
-		len = set_name_idx(file_name, PATH_MAX, td->o.directory, numjob);
+		len = set_name_idx(file_name, PATH_MAX, td->o.directory, numjob,
+					td->o.unique_filename);
 
 	sprintf(file_name + len, "%s", fname);