splice: fix fallback from copy vmsplice to nothing

[fio.git] / ioengines.c

diff --git a/ioengines.c b/ioengines.c
index feb986a844bba2342c5844094bacc89f6ed26821..d34d2f4303764566da297e327670d935e23de7ea 100644 (file)
--- a/ioengines.c
+++ b/ioengines.c
@@ -157,6 +157,8 @@ void close_ioengine(struct thread_data *td)
 
 int td_io_prep(struct thread_data *td, struct io_u *io_u)
 {
+       fio_ro_check(td, io_u);
+
        if (td->io_ops->prep)
                return td->io_ops->prep(td, io_u);
 
@@ -182,6 +184,8 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u)
 {
        int ret;
 
+       fio_ro_check(td, io_u);
+
        assert((io_u->flags & IO_U_F_FLIGHT) == 0);
        io_u->flags |= IO_U_F_FLIGHT;
 
@@ -241,7 +245,7 @@ int td_io_init(struct thread_data *td)
        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");
+                       log_err("fio: io engine init failed. Perhaps try reducing io depth?\n");
        }
 
        return ret;
@@ -279,7 +283,7 @@ 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->last_pos = f->file_offset;
        f->flags |= FIO_FILE_OPEN;
        f->flags &= ~FIO_FILE_CLOSING;
 
@@ -309,6 +313,7 @@ int td_io_open_file(struct thread_data *td, struct fio_file *f)
                memset(f->file_map, 0, f->num_maps * sizeof(long));
 
 done:
+       log_file(td, f, FIO_LOG_OPEN_FILE);
        td->nr_open_files++;
        get_file(f);
        return 0;
@@ -320,6 +325,9 @@ err:
 
 void td_io_close_file(struct thread_data *td, struct fio_file *f)
 {
+       if (!(f->flags & FIO_FILE_CLOSING))
+               log_file(td, f, FIO_LOG_CLOSE_FILE);
+
        /*
         * mark as closing, do real close when last io on it has completed
         */