Revert "ioengines.c:346: td_io_queue: Assertion `res == 0' failed"

This reverts commit d5a47449ce79001ba233fe6d0499627d0438cb69.

The change to rate-submit.c is clearly bogus, as it's referencing
'td' outside of the actual 'td' loop. It's not valid at that
point.

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/io_u.h b/io_u.h
index 6b4c3014bac4ff48765f1ea80bcf0063c7add53e..55b4d08312b2d3fff93f341ff194f22a426d09e6 100644 (file)
--- a/io_u.h
+++ b/io_u.h
@@ -22,7 +22,6 @@ enum {
        IO_U_F_BARRIER          = 1 << 6,
        IO_U_F_VER_LIST         = 1 << 7,
        IO_U_F_PATTERN_DONE     = 1 << 8,
-       IO_U_F_OVERLAP_LOCK     = 1 << 9,
 };
 
 /*

diff --git a/ioengines.c b/ioengines.c
index 843dd466373a28ae853b1b4e62c3cdbd6eeeff8c..e2316ee4e391d0d5899c960552fec4d19aa33ca2 100644 (file)
--- a/ioengines.c
+++ b/ioengines.c
@@ -341,10 +341,9 @@ enum fio_q_status td_io_queue(struct thread_data *td, struct io_u *io_u)
         * started the overlap check because the IO_U_F_FLIGHT
         * flag is now set
         */
-       if (io_u->flags & IO_U_F_OVERLAP_LOCK) {
+       if (td_offload_overlap(td)) {
                int res = pthread_mutex_unlock(&overlap_check);
                assert(res == 0);
-               io_u_clear(td, io_u, IO_U_F_OVERLAP_LOCK);
        }
 
        assert(fio_file_open(io_u->file));

diff --git a/rate-submit.c b/rate-submit.c
index 902a6c00b36c83486cc5bfd7b798f72c0dff1979..3cc17eaa560304b48fc2ec07f163b31fb204b9db 100644 (file)
--- a/rate-submit.c
+++ b/rate-submit.c
@@ -47,7 +47,6 @@ retry:
                assert(res == 0);
                goto retry;
        }
-       io_u_set(td, io_u, IO_U_F_OVERLAP_LOCK);
 }
 
 static int io_workqueue_fn(struct submit_worker *sw,