From 2d24805793941d066871f0385a206c4700ea5d59 Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Mon, 13 Apr 2020 21:01:49 +0200 Subject: [PATCH 13/15] blkparse: Fix device in event tracking error messages For some reason, dev in struct per_dev_info isn't set in the log_track_ functions, and so the error messages report (0,0) as the device. Fix by using device in struct blk_io_trace instead. Signed-off-by: Andreas Gruenbacher Signed-off-by: Jens Axboe --- blkparse.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/blkparse.c b/blkparse.c index 08c9f60..6cba92c 100644 --- a/blkparse.c +++ b/blkparse.c @@ -986,7 +986,7 @@ static void log_track_frontmerge(struct per_dev_info *pdi, if (!iot) { if (verbose) fprintf(stderr, "merge not found for (%d,%d): %llu\n", - MAJOR(pdi->dev), MINOR(pdi->dev), + MAJOR(t->device), MINOR(t->device), (unsigned long long) t->sector + t_sec(t)); return; } @@ -1080,7 +1080,7 @@ static unsigned long long log_track_issue(struct per_dev_info *pdi, if (!iot) { if (verbose) fprintf(stderr, "issue not found for (%d,%d): %llu\n", - MAJOR(pdi->dev), MINOR(pdi->dev), + MAJOR(t->device), MINOR(t->device), (unsigned long long) t->sector); return -1; } @@ -1115,7 +1115,7 @@ static unsigned long long log_track_complete(struct per_dev_info *pdi, if (!iot) { if (verbose) fprintf(stderr,"complete not found for (%d,%d): %llu\n", - MAJOR(pdi->dev), MINOR(pdi->dev), + MAJOR(t->device), MINOR(t->device), (unsigned long long) t->sector); return -1; } -- 1.8.3.1