From: Jens Axboe <axboe@kernel.dk>
Date: Sat, 11 Feb 2012 08:06:58 +0000 (+0100)
Subject: Revert "Change iolog overlap assert to a debug dump"
X-Git-Tag: fio-2.0.4~35
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=d401b24d00244223f04ddeee0c563909ad7f4f31;hp=d4e88b4694afec138b36114d350a0ba160e555ea

Revert "Change iolog overlap assert to a debug dump"

Issued has been fixed, restore assert.

This reverts commit 86f40280e27474c666fea75cc705caeaf94f6346.

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

diff --git a/iolog.c b/iolog.c
index c1764bac..1d61ba23 100644
--- 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
  */
@@ -245,12 +239,7 @@ restart:
 		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);