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 <agruenba@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/blkparse.c b/blkparse.c
index 28bdf1543ddb85b2a43cfff7a5a90830e11f62b2..0054d4f0aa2ed070da17da74b00e883fb59f98bf 100644 (file)
--- a/blkparse.c
+++ b/blkparse.c
@@ -1006,7 +1006,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;
        }
@@ -1100,7 +1100,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;
        }
@@ -1135,7 +1135,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;
        }