X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=ioengines.c;h=d71e372048112e19010c1dd494a7a4b2872eb5fa;hp=f4eae04db6df5d072103191f05b187fcb6f19e80;hb=fdc0f3b646e417497849d4398029f780b0e5262f;hpb=8ea39c32d29428b17bfe9c806fc33f0c8adfe118

diff --git a/ioengines.c b/ioengines.c
index f4eae04d..d71e3720 100644
--- a/ioengines.c
+++ b/ioengines.c
@@ -287,6 +287,13 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u)
 
 	unlock_file(td, io_u->file);
 
+	/*
+	 * If an error was seen and the io engine didn't propagate it
+	 * back to 'td', do so.
+	 */
+	if (io_u->error && !td->error)
+		td_verror(td, io_u->error, "td_io_queue");
+
 	/*
 	 * Add warning for O_DIRECT so that users have an easier time
 	 * spotting potentially bad alignment. If this triggers for the first
@@ -475,7 +482,9 @@ int td_io_close_file(struct thread_data *td, struct fio_file *f)
 	fio_file_set_closing(f);
 
 	disk_util_dec(f->du);
-	unlock_file_all(td, f);
+
+	if (td->o.file_lock_mode != FILE_LOCK_NONE)
+		unlock_file_all(td, f);
 
 	return put_file(td, f);
 }