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

diff --git a/filesetup.c b/filesetup.c
index 2e8821c5..610981b4 100644
--- a/filesetup.c
+++ b/filesetup.c
@@ -103,9 +103,19 @@ static int create_files(struct thread_data *td)
 		return 0;
 
 	need_create = 0;
-	if (td->filetype == FIO_TYPE_FILE)
-		for_each_file(td, f, i)
-			need_create += file_ok(td, f);
+	if (td->filetype == FIO_TYPE_FILE) {
+		for_each_file(td, f, i) {
+			int file_there = !file_ok(td, f);
+
+			if (file_there && td->ddir == DDIR_WRITE &&
+			    !td->overwrite) {
+				unlink(f->file_name);
+				file_there = 0;
+			}
+
+			need_create += !file_there;
+		}
+	}
 
 	if (!need_create)
 		return 0;
@@ -124,7 +134,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 +164,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;
 }
 
@@ -315,6 +330,8 @@ static int setup_file(struct thread_data *td, struct fio_file *f)
 {
 	int flags = 0;
 
+	if (td->io_ops->flags & FIO_NETIO)
+		return 0;
 	if (td->odirect)
 		flags |= OS_O_DIRECT;
 	if (td->sync_io)
@@ -434,7 +451,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);