X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=iolog.c;h=b73c208e468e5e948c799d4a2d8d9beb72c60f49;hp=c1764bac76f8e56568d77af112353d31ccc3d12f;hb=2cf37420c461fb96b187928581dabf56f7456073;hpb=86f40280e27474c666fea75cc705caeaf94f6346

diff --git a/iolog.c b/iolog.c
index c1764bac..b73c208e 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,9 @@ 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");
-			}
+			dprint(FD_IO, "iolog: overlap %llu/%lu, %llu/%lu",
+				__ipo->offset, __ipo->len,
+				ipo->offset, ipo->len);
 			td->io_hist_len--;
 			rb_erase(parent, &td->io_hist_tree);
 			remove_trim_entry(td, __ipo);
@@ -325,6 +316,7 @@ static int read_iolog2(struct thread_data *td, FILE *f)
 									act);
 				continue;
 			}
+			fileno = get_fileno(td, fname);
 		} else if (r == 2) {
 			rw = DDIR_INVAL;
 			if (!strcmp(act, "add")) {
@@ -543,7 +535,7 @@ void finish_log_named(struct thread_data *td, struct io_log *log,
 {
 	char file_name[256], *p;
 
-	snprintf(file_name, 200, "%s_%s.log", prefix, postfix);
+	snprintf(file_name, sizeof(file_name), "%s_%s.log", prefix, postfix);
 	p = basename(file_name);
 	__finish_log(log, p);
 }