From 14520f23661673fcd0fc4b4c27b3bd7b5b9fe524 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Tue, 28 Feb 2023 08:54:36 -0700 Subject: [PATCH] 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 --- io_u.h | 1 - ioengines.c | 3 +-- rate-submit.c | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/io_u.h b/io_u.h index 6b4c3014..55b4d083 100644 --- 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 843dd466..e2316ee4 100644 --- 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 902a6c00..3cc17eaa 100644 --- 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, -- 2.25.1