X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=iolog.c;h=9bcf0d8e2982e37ce5d48fbd64e9653872e54ea0;hp=0e492363465e9a94ad88433008fbcfdf59485e2f;hb=795ae7064af3252750f57c5da667361e9c628687;hpb=b0df7176176935b4d39fd196ad35f046bbe10333

diff --git a/iolog.c b/iolog.c
index 0e492363..9bcf0d8e 100644
--- a/iolog.c
+++ b/iolog.c
@@ -238,7 +238,9 @@ restart:
 		else if (ipo->offset > __ipo->offset)
 			p = &(*p)->rb_right;
 		else {
-			assert(ipo->len == __ipo->len);
+			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);
@@ -313,6 +315,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")) {
@@ -532,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);
 
 	if (td->client_type == FIO_CLIENT_TYPE_GUI) {