summaryrefslogtreecommitdiffstats
path: root/block/genhd.c
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2017-06-30 23:55:08 -0400
committerJens Axboe <axboe@kernel.dk>2017-08-09 15:09:16 -0400
commitd62e26b3ffd28f16ddae85a1babd0303a1a6dfb6 (patch)
tree622dd61c60712f31575b2cdde0811529b829ba8a /block/genhd.c
parent7f5562d5ecc44c757599b201df928ba52fa05047 (diff)
block: pass in queue to inflight accounting
No functional change in this patch, just in preparation for basing the inflight mechanism on the queue in question. Reviewed-by: Bart Van Assche <bart.vanassche@wdc.com> Reviewed-by: Omar Sandoval <osandov@fb.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/genhd.c')
-rw-r--r--block/genhd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/block/genhd.c b/block/genhd.c
index 7f520fa25d16..f735af67a0c9 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -1217,7 +1217,7 @@ static int diskstats_show(struct seq_file *seqf, void *v)
1217 disk_part_iter_init(&piter, gp, DISK_PITER_INCL_EMPTY_PART0); 1217 disk_part_iter_init(&piter, gp, DISK_PITER_INCL_EMPTY_PART0);
1218 while ((hd = disk_part_iter_next(&piter))) { 1218 while ((hd = disk_part_iter_next(&piter))) {
1219 cpu = part_stat_lock(); 1219 cpu = part_stat_lock();
1220 part_round_stats(cpu, hd); 1220 part_round_stats(gp->queue, cpu, hd);
1221 part_stat_unlock(); 1221 part_stat_unlock();
1222 seq_printf(seqf, "%4d %7d %s %lu %lu %lu " 1222 seq_printf(seqf, "%4d %7d %s %lu %lu %lu "
1223 "%u %lu %lu %lu %u %u %u %u\n", 1223 "%u %lu %lu %lu %u %u %u %u\n",
@@ -1231,7 +1231,7 @@ static int diskstats_show(struct seq_file *seqf, void *v)
1231 part_stat_read(hd, merges[WRITE]), 1231 part_stat_read(hd, merges[WRITE]),
1232 part_stat_read(hd, sectors[WRITE]), 1232 part_stat_read(hd, sectors[WRITE]),
1233 jiffies_to_msecs(part_stat_read(hd, ticks[WRITE])), 1233 jiffies_to_msecs(part_stat_read(hd, ticks[WRITE])),
1234 part_in_flight(hd), 1234 part_in_flight(gp->queue, hd),
1235 jiffies_to_msecs(part_stat_read(hd, io_ticks)), 1235 jiffies_to_msecs(part_stat_read(hd, io_ticks)),
1236 jiffies_to_msecs(part_stat_read(hd, time_in_queue)) 1236 jiffies_to_msecs(part_stat_read(hd, time_in_queue))
1237 ); 1237 );