X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=ioengines.c;h=4ab08ce7472ca806573cf4fcb9875c96645c9b5f;hb=0725726350094b2f8ff558d6ee470e3835512063;hp=88e91ccbbf0b2f29b422f9be5552930bf010dcfd;hpb=b3605062146bce0136918763bb8eb584478ae042;p=fio.git

diff --git a/ioengines.c b/ioengines.c
index 88e91ccb..4ab08ce7 100644
--- a/ioengines.c
+++ b/ioengines.c
@@ -186,6 +186,8 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u)
 	assert((io_u->flags & IO_U_F_FLIGHT) == 0);
 	io_u->flags |= IO_U_F_FLIGHT;
 
+	assert(io_u->file->flags & FIO_FILE_OPEN);
+
 	io_u->error = 0;
 	io_u->resid = 0;
 
@@ -206,11 +208,14 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u)
 
 	ret = td->io_ops->queue(td, io_u);
 
+	if (ret == FIO_Q_QUEUED || ret == FIO_Q_COMPLETED)
+		get_file(io_u->file);
+
 	if (ret == FIO_Q_QUEUED) {
 		int r;
 
 		td->io_u_queued++;
-		if (td->io_u_queued > td->iodepth_batch) {
+		if (td->io_u_queued > td->o.iodepth_batch) {
 			r = td_io_commit(td);
 			if (r < 0)
 				return r;
@@ -233,10 +238,15 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u)
 
 int td_io_init(struct thread_data *td)
 {
-	if (td->io_ops->init)
-		return td->io_ops->init(td);
+	int ret = 0;
 
-	return 0;
+	if (td->io_ops->init) {
+		ret = td->io_ops->init(td);
+		if (ret && td->o.iodepth > 1)
+			log_err("fio: io engine init failed. Perhaps try reducing io dpeth?\n");
+	}
+
+	return ret;
 }
 
 int td_io_commit(struct thread_data *td)
@@ -259,21 +269,24 @@ int td_io_open_file(struct thread_data *td, struct fio_file *f)
 	f->last_free_lookup = 0;
 	f->last_completed_pos = 0;
 	f->last_pos = 0;
-	f->open = 1;
+	f->flags |= FIO_FILE_OPEN;
+	f->flags &= ~FIO_FILE_CLOSING;
 
 	if (f->file_map)
 		memset(f->file_map, 0, f->num_maps * sizeof(long));
 
 	td->nr_open_files++;
+	get_file(f);
 	return 0;
 }
 
 void td_io_close_file(struct thread_data *td, struct fio_file *f)
 {
-	if (f->open) {
-		if (td->io_ops->close_file)
-			td->io_ops->close_file(td, f);
-		td->nr_open_files--;
-		f->open = 0;
-	}
+	/*
+	 * mark as closing, do real close when last io on it has completed
+	 */
+	f->flags |= FIO_FILE_CLOSING;
+
+	put_file(td, f);
 }
+