genfio: Splitting gen_template in 2 parts

[fio.git] / ioengines.c

diff --git a/ioengines.c b/ioengines.c
index f4eae04db6df5d072103191f05b187fcb6f19e80..d71e372048112e19010c1dd494a7a4b2872eb5fa 100644 (file)
--- 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);
 }