Revert "Change iolog overlap assert to a debug dump"
authorJens Axboe <axboe@kernel.dk>
Sat, 11 Feb 2012 08:06:58 +0000 (09:06 +0100)
committerJens Axboe <axboe@kernel.dk>
Sat, 11 Feb 2012 08:06:58 +0000 (09:06 +0100)
Issued has been fixed, restore assert.

This reverts commit 86f40280e27474c666fea75cc705caeaf94f6346.

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

diff --git a/iolog.c b/iolog.c
index c1764bac76f8e56568d77af112353d31ccc3d12f..1d61ba23ac3ba82b6334ad45dc0a16aee7babd49 100644 (file)
--- a/iolog.c
+++ b/iolog.c
@@ -176,12 +176,6 @@ void prune_io_piece_log(struct thread_data *td)
        }
 }
 
        }
 }
 
-static void dump_ipo(struct io_piece *ipo, const char *msg)
-{
-       printf("%s\n", msg);
-       printf("\toffset %llu, len %lu, fl %x, ddir %d\n", ipo->offset, ipo->len, ipo->flags, ipo->ddir);
-}
-
 /*
  * log a successful write, so we can unwind the log for verify
  */
 /*
  * log a successful write, so we can unwind the log for verify
  */
@@ -245,12 +239,7 @@ restart:
                else if (ipo->offset > __ipo->offset)
                        p = &(*p)->rb_right;
                else {
                else if (ipo->offset > __ipo->offset)
                        p = &(*p)->rb_right;
                else {
-                       if (ipo->len != __ipo->len) {
-                               log_err("fio: unexpected ipo overlap!\n");
-                               log_err("fio: please report this issue.\n");
-                               dump_ipo(ipo, "ipo");
-                               dump_ipo(__ipo, "__ipo");
-                       }
+                       assert(ipo->len == __ipo->len);
                        td->io_hist_len--;
                        rb_erase(parent, &td->io_hist_tree);
                        remove_trim_entry(td, __ipo);
                        td->io_hist_len--;
                        rb_erase(parent, &td->io_hist_tree);
                        remove_trim_entry(td, __ipo);