t/nvmept_trim: increase transfer size for some tests

[fio.git] / backend.c

diff --git a/backend.c b/backend.c
index 2f2221bf9c6398920628897e82da7d14f1650f36..fe03eab3870f1588bc5e09ab119e7d358d659f52 100644 (file)
--- a/backend.c
+++ b/backend.c
@@ -977,6 +977,11 @@ static void do_io(struct thread_data *td, uint64_t *bytes_done)
        */
        if (td_write(td) && td_random(td) && td->o.norandommap)
                total_bytes = max(total_bytes, (uint64_t) td->o.io_size);
+
+       /* Don't break too early if io_size > size */
+       if (td_rw(td) && !td_random(td))
+               total_bytes = max(total_bytes, (uint64_t)td->o.io_size);
+
        /*
         * If verify_backlog is enabled, we'll run the verify in this
         * handler as well. For that case, we may need up to twice the
@@ -2094,14 +2099,14 @@ static void reap_threads(unsigned int *nr_running, uint64_t *t_rate,
                         uint64_t *m_rate)
 {
        unsigned int cputhreads, realthreads, pending;
-       int status, ret;
+       int ret;
 
        /*
         * reap exited threads (TD_EXITED -> TD_REAPED)
         */
        realthreads = pending = cputhreads = 0;
        for_each_td(td) {
-               int flags = 0;
+               int flags = 0, status;
 
                if (!strcmp(td->o.ioengine, "cpuio"))
                        cputhreads++;