X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=filesetup.c;h=75288706cdd2e09a8aa138a67d2d671668557e08;hp=2e8821c5c6d6a36ef0e840d3e9b6161f3ba5eb1f;hb=f829527633c3ebba26edb4745172d938a8ae4bb6;hpb=1e97cce9f5a87a67293a05ec4533ed6968698b2e

diff --git a/filesetup.c b/filesetup.c
index 2e8821c5..75288706 100644
--- a/filesetup.c
+++ b/filesetup.c
@@ -124,7 +124,12 @@ static int create_files(struct thread_data *td)
 
 	err = 0;
 	for_each_file(td, f, i) {
+		/*
+		 * Only unlink files that we created.
+		 */
+		f->unlink = 0;
 		if (file_ok(td, f)) {
+			f->unlink = td->unlink;
 			err = create_file(td, f);
 			if (err)
 				break;
@@ -149,9 +154,9 @@ static int file_size(struct thread_data *td, struct fio_file *f)
 
 		if (!f->file_size || f->file_size > f->real_file_size)
 			f->file_size = f->real_file_size;
-	}
+	} else
+		f->real_file_size = f->file_size;
 
-	f->file_size -= f->file_offset;
 	return 0;
 }
 
@@ -434,7 +439,7 @@ void close_files(struct thread_data *td)
 	int i;
 
 	for_each_file(td, f, i) {
-		if (!td->filename && td->unlink &&
+		if (!td->filename && f->unlink &&
 		    td->filetype == FIO_TYPE_FILE) {
 			unlink(f->file_name);
 			free(f->file_name);