X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=filesetup.c;h=c188981356a2cb022e9037d84c8f6f01d9c33a6c;hp=1a5a7eccb1b8c95c545c7b94923990d6a005e23c;hb=e2de69dac799a1eecac1b52085f908729591ef5a;hpb=9c0d224129b0c59698e4c77e7fed00dc8cbb50e1

diff --git a/filesetup.c b/filesetup.c
index 1a5a7ecc..c1889813 100644
--- a/filesetup.c
+++ b/filesetup.c
@@ -64,6 +64,19 @@ static int extend_file(struct thread_data *td, struct fio_file *f)
 		return 1;
 	}
 
+#ifdef FIO_HAVE_FALLOCATE
+	if (td->o.fallocate && !td->o.fill_device) {
+		dprint(FD_FILE, "fallocate file %s size %llu\n", f->file_name,
+							f->real_file_size);
+
+		r = posix_fallocate(f->fd, 0, f->real_file_size);
+		if (r < 0) {
+			log_err("fio: posix_fallocate fails: %s\n",
+					strerror(-r));
+		}
+	}
+#endif
+	
 	if (!new_layout)
 		goto done;
 
@@ -78,16 +91,6 @@ static int extend_file(struct thread_data *td, struct fio_file *f)
 			td_verror(td, errno, "ftruncate");
 			goto err;
 		}
-
-#ifdef FIO_HAVE_FALLOCATE
-		dprint(FD_FILE, "fallocate file %s, size %llu\n", f->file_name,
-							f->real_file_size);
-		r = posix_fallocate(f->fd, 0, f->real_file_size);
-		if (r < 0) {
-			log_err("fio: posix_fallocate fails: %s\n",
-					strerror(-r));
-		}
-#endif
 	}
 
 	b = malloc(td->o.max_bs[DDIR_WRITE]);
@@ -303,9 +306,12 @@ static int __file_invalidate_cache(struct thread_data *td, struct fio_file *f,
 	/*
 	 * FIXME: add blockdev flushing too
 	 */
-	if (f->mmap_ptr)
+	if (f->mmap_ptr) {
 		ret = madvise(f->mmap_ptr, f->mmap_sz, MADV_DONTNEED);
-	else if (f->filetype == FIO_TYPE_FILE) {
+#ifdef FIO_MADV_FREE
+		(void) madvise(f->mmap_ptr, f->mmap_sz, FIO_MADV_FREE);
+#endif
+	} else if (f->filetype == FIO_TYPE_FILE) {
 		ret = fadvise(f->fd, off, len, POSIX_FADV_DONTNEED);
 	} else if (f->filetype == FIO_TYPE_BD) {
 		ret = blockdev_invalidate_cache(f->fd);
@@ -611,7 +617,7 @@ int setup_files(struct thread_data *td)
 		temp_stall_ts = 1;
 		if (!terse_output)
 			log_info("%s: Laying out IO file(s) (%u file(s) /"
-				 " %LuMiB)\n", td->o.name, need_extend,
+				 " %LuMB)\n", td->o.name, need_extend,
 					extend_size >> 20);
 
 		for_each_file(td, f, i) {
@@ -624,7 +630,8 @@ int setup_files(struct thread_data *td)
 			fio_file_clear_extend(f);
 			if (!td->o.fill_device) {
 				old_len = f->real_file_size;
-				extend_len = f->io_size + f->file_offset - old_len;
+				extend_len = f->io_size + f->file_offset -
+						old_len;
 			}
 			f->real_file_size = (f->io_size + f->file_offset);
 			err = extend_file(td, f);
@@ -763,7 +770,7 @@ static void get_file_type(struct fio_file *f)
 	else
 		f->filetype = FIO_TYPE_FILE;
 
-	if (!lstat(f->file_name, &sb)) {
+	if (!stat(f->file_name, &sb)) {
 		if (S_ISBLK(sb.st_mode))
 			f->filetype = FIO_TYPE_BD;
 		else if (S_ISCHR(sb.st_mode))
@@ -787,7 +794,7 @@ int add_file(struct thread_data *td, const char *fname)
 		log_err("fio: smalloc OOM\n");
 		assert(0);
 	}
-		
+
 	f->fd = -1;
 
 	if (td->files_size <= td->files_index) {
@@ -815,7 +822,7 @@ int add_file(struct thread_data *td, const char *fname)
 		log_err("fio: smalloc OOM\n");
 		assert(0);
 	}
-	
+
 	get_file_type(f);
 
 	switch (td->o.file_lock_mode) {
@@ -1016,14 +1023,14 @@ void dup_files(struct thread_data *td, struct thread_data *org)
 			assert(0);
 		}
 		__f->fd = -1;
-	
+
 		if (f->file_name) {
 			__f->file_name = smalloc_strdup(f->file_name);
 			if (!__f->file_name) {
 				log_err("fio: smalloc OOM\n");
 				assert(0);
 			}
-	
+
 			__f->filetype = f->filetype;
 		}