X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=filesetup.c;h=2e8821c5c6d6a36ef0e840d3e9b6161f3ba5eb1f;hb=871c0fc7c3af41dea5879dec5308ab095cf10c82;hp=a1633827fe8eca63017bb8a2d91b731dd9854b73;hpb=a00735e66f9ec42549da94eba3170e543b542904;p=fio.git

diff --git a/filesetup.c b/filesetup.c
index a1633827..2e8821c5 100644
--- a/filesetup.c
+++ b/filesetup.c
@@ -93,15 +93,14 @@ static int create_files(struct thread_data *td)
 	struct fio_file *f;
 	int i, err, need_create;
 
+	for_each_file(td, f, i)
+		f->file_size = td->total_file_size / td->nr_files;
+
 	/*
 	 * unless specifically asked for overwrite, let normal io extend it
 	 */
-	if (!td->overwrite) {
-		for_each_file(td, f, i)
-			f->file_size = td->total_file_size / td->nr_files;
-
+	if (!td->overwrite)
 		return 0;
-	}
 
 	need_create = 0;
 	if (td->filetype == FIO_TYPE_FILE)
@@ -118,7 +117,7 @@ static int create_files(struct thread_data *td)
 	}
 
 	temp_stall_ts = 1;
-	fprintf(f_out, "%s: Laying out IO file(s) (%d x %LuMiB == %LuMiB)\n",
+	fprintf(f_out, "%s: Laying out IO file(s) (%u x %LuMiB == %LuMiB)\n",
 				td->name, td->nr_uniq_files,
 				(td->total_file_size >> 20) / td->nr_uniq_files,
 				td->total_file_size >> 20);
@@ -318,18 +317,18 @@ static int setup_file(struct thread_data *td, struct fio_file *f)
 
 	if (td->odirect)
 		flags |= OS_O_DIRECT;
+	if (td->sync_io)
+		flags |= O_SYNC;
 
 	if (td_write(td) || td_rw(td)) {
+		flags |= O_RDWR;
+
 		if (td->filetype == FIO_TYPE_FILE) {
 			if (!td->overwrite)
 				flags |= O_TRUNC;
 
 			flags |= O_CREAT;
 		}
-		if (td->sync_io)
-			flags |= O_SYNC;
-
-		flags |= O_RDWR;
 
 		f->fd = open(f->file_name, flags, 0600);
 	} else {
@@ -352,10 +351,34 @@ static int setup_file(struct thread_data *td, struct fio_file *f)
 	return 0;
 }
 
+int open_files(struct thread_data *td)
+{
+	struct fio_file *f;
+	int i, err = 0;
+
+	for_each_file(td, f, i) {
+		err = setup_file(td, f);
+		if (err)
+			break;
+	}
+
+	if (!err)
+		return 0;
+
+	for_each_file(td, f, i) {
+		if (f->fd != -1) {
+			close(f->fd);
+			f->fd = -1;
+		}
+	}
+
+	return err;
+}
+
 int setup_files(struct thread_data *td)
 {
 	struct fio_file *f;
-	int i, err;
+	int err, i;
 
 	/*
 	 * if ioengine defines a setup() method, it's responsible for
@@ -367,13 +390,7 @@ int setup_files(struct thread_data *td)
 	if (create_files(td))
 		return 1;
 
-	err = 0;
-	for_each_file(td, f, i) {
-		err = setup_file(td, f);
-		if (err)
-			break;
-	}
-
+	err = open_files(td);
 	if (err)
 		return err;
 
@@ -397,9 +414,18 @@ int setup_files(struct thread_data *td)
 	td->total_io_size = td->io_size * td->loops;
 
 	if (td->io_ops->flags & FIO_MMAPIO)
-		return setup_files_mmap(td);
+		err = setup_files_mmap(td);
 	else
-		return setup_files_plain(td);
+		err = setup_files_plain(td);
+
+	for_each_file(td, f, i) {
+		if (f->fd != -1) {
+			close(f->fd);
+			f->fd = -1;
+		}
+	}
+
+	return err;
 }
 
 void close_files(struct thread_data *td)
@@ -408,14 +434,13 @@ void close_files(struct thread_data *td)
 	int i;
 
 	for_each_file(td, f, i) {
-		if (f->fd != -1) {
-			if (td->unlink && td->filetype == FIO_TYPE_FILE &&
-			    td->filename) {
-				unlink(f->file_name);
-				td->filename = NULL;
-			}
+		if (!td->filename && td->unlink &&
+		    td->filetype == FIO_TYPE_FILE) {
+			unlink(f->file_name);
 			free(f->file_name);
 			f->file_name = NULL;
+		}
+		if (f->fd != -1) {
 			close(f->fd);
 			f->fd = -1;
 		}
@@ -425,6 +450,7 @@ void close_files(struct thread_data *td)
 		}
 	}
 
+	td->filename = NULL;
 	free(td->files);
 	td->files = NULL;
 	td->nr_files = 0;