X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=filesetup.c;h=d55af45404af36ab8d1204479d844d5525bc7adb;hp=6d8aa7a7087bdc67c8e72d0f5a8a4aa9fe22b8ef;hb=5daa4ebe;hpb=a596f047e2b3d447ccca76bd075f05473a1f8d1c

diff --git a/filesetup.c b/filesetup.c
index 6d8aa7a7..d55af454 100644
--- a/filesetup.c
+++ b/filesetup.c
@@ -280,7 +280,6 @@ static int bdev_size(struct thread_data *td, struct fio_file *f)
 	r = blockdev_size(f, &bytes);
 	if (r) {
 		td_verror(td, r, "blockdev_size");
-		printf("fd is %d\n", f->fd);
 		goto err;
 	}
 
@@ -760,6 +759,9 @@ 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;
 
@@ -847,11 +849,15 @@ int init_random_map(struct thread_data *td)
 				(unsigned long long) td->o.rw_min_bs;
 		num_maps = (blocks + BLOCKS_PER_MAP - 1) /
 				(unsigned long long) BLOCKS_PER_MAP;
-		f->file_map = smalloc(num_maps * sizeof(unsigned long));
-		if (f->file_map) {
-			f->num_maps = num_maps;
-			continue;
-		}
+		if (num_maps == (unsigned long) num_maps) {
+			f->file_map = smalloc(num_maps * sizeof(unsigned long));
+			if (f->file_map) {
+				f->num_maps = num_maps;
+				continue;
+			}
+		} else
+			f->file_map = NULL;
+
 		if (!td->o.softrandommap) {
 			log_err("fio: failed allocating random map. If running"
 				" a large number of jobs, try the 'norandommap'"