X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=ioengines.c;h=66991c7cce1f3bb93b6b73981f43e5d3b82039ad;hb=09629a90d5b68b220e3fb98318e2dcd019943eda;hp=9d7453bafcaef77ce32b64d76d99c5d033600555;hpb=b5af82930ccfd7dda6a1b11794efb452eb76d8dc;p=fio.git

diff --git a/ioengines.c b/ioengines.c
index 9d7453ba..66991c7c 100644
--- a/ioengines.c
+++ b/ioengines.c
@@ -158,10 +158,7 @@ void close_ioengine(struct thread_data *td)
 	if (td->io_ops->dlhandle)
 		dlclose(td->io_ops->dlhandle);
 
-#if 0
-	/* we can't do this for threads, so just leak it, it's exiting */
 	free(td->io_ops);
-#endif
 	td->io_ops = NULL;
 }
 
@@ -260,17 +257,27 @@ int td_io_commit(struct thread_data *td)
 
 int td_io_open_file(struct thread_data *td, struct fio_file *f)
 {
-	if (!td->io_ops->open_file(td, f)) {
-		td->nr_open_files++;
-		return 0;
-	}
+	if (td->io_ops->open_file(td, f))
+		return 1;
+
+	f->last_free_lookup = 0;
+	f->last_completed_pos = 0;
+	f->last_pos = 0;
+	f->open = 1;
 
-	return 1;
+	if (f->file_map)
+		memset(f->file_map, 0, f->num_maps * sizeof(long));
+
+	td->nr_open_files++;
+	return 0;
 }
 
 void td_io_close_file(struct thread_data *td, struct fio_file *f)
 {
-	if (td->io_ops->close_file)
-		td->io_ops->close_file(td, f);
-	td->nr_open_files--;
+	if (f->open) {
+		if (td->io_ops->close_file)
+			td->io_ops->close_file(td, f);
+		td->nr_open_files--;
+		f->open = 0;
+	}
 }