Move ->commit() call to td_io_getevents()

If we need to complete some events (min > 0), make sure we
have committed a pending batch.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

diff --git a/io_u.c b/io_u.c
index 372f46a0507ddd941f47ff9d38a16a6d745569ae..ede61a8eae32dfcd34bc5b9022b99f2b05eaad3b 100644 (file)
--- a/io_u.c
+++ b/io_u.c
@@ -572,13 +572,7 @@ long io_u_queued_complete(struct thread_data *td, int min_events)
        struct timespec *tvp = NULL;
        int ret;
 
-       if (min_events > 0) {
-               ret = td_io_commit(td);
-               if (ret < 0) {
-                       td_verror(td, -ret, "td_io_commit");
-                       return ret;
-               }
-       } else {
+       if (!min_events) {
                struct timespec ts = { .tv_sec = 0, .tv_nsec = 0, };
 
                tvp = &ts;

diff --git a/ioengines.c b/ioengines.c
index 0b3ec16485124df5eb3e3e7396e0208a4cd4ac27..727981f12415ab52bace3c2788d589fbc9cc2e99 100644 (file)
--- a/ioengines.c
+++ b/ioengines.c
@@ -182,6 +182,12 @@ int td_io_prep(struct thread_data *td, struct io_u *io_u)
 int td_io_getevents(struct thread_data *td, int min, int max,
                    struct timespec *t)
 {
+       if (min > 0 && td->io_ops->commit) {
+               int r = td->io_ops->commit(td);
+
+               if (r < 0)
+                       return r;
+       }
        if (td->io_ops->getevents)
                return td->io_ops->getevents(td, min, max, t);