splice: fix problem with current mainline kernels

[fio.git] / fio.c

diff --git a/fio.c b/fio.c
index bc837c444b91c7b8ad3c6c4a56317856f9bdf1ff..02ed91dbcea0b70454fee2b78b68c5041b49107d 100644 (file)
--- a/fio.c
+++ b/fio.c
@@ -446,6 +446,13 @@ static void do_io(struct thread_data *td)
                        break;
                }
 
+               /*
+                * Add verification end_io handler, if asked to verify
+                * a previously written file.
+                */
+               if (td->o.verify != VERIFY_NONE)
+                       io_u->end_io = verify_io_u;
+
                ret = td_io_queue(td, io_u);
                switch (ret) {
                case FIO_Q_COMPLETED:
@@ -894,7 +901,9 @@ static void *thread_main(void *data)
                if (td->error || td->terminate)
                        break;
 
-               if (td->o.verify == VERIFY_NONE)
+               if (!td->o.do_verify ||
+                   td->o.verify == VERIFY_NONE ||
+                   (td->io_ops->flags & FIO_UNIDIR))
                        continue;
 
                if (clear_io_state(td))
@@ -911,8 +920,8 @@ static void *thread_main(void *data)
        }
 
        update_rusage_stat(td);
-       td->ts.runtime[0] = runtime[0] / 1000;
-       td->ts.runtime[1] = runtime[1] / 1000;
+       td->ts.runtime[0] = (runtime[0] + 999) / 1000;
+       td->ts.runtime[1] = (runtime[1] + 999) / 1000;
        td->ts.total_run_time = mtime_since_now(&td->epoch);
        td->ts.io_bytes[0] = td->io_bytes[0];
        td->ts.io_bytes[1] = td->io_bytes[1];