block: fix that util can be greater than 100%

[linux-block.git] / block / genhd.c

diff --git a/block/genhd.c b/block/genhd.c
index 8f1163d2d17166ed71bd33a1a565e118f2bc3855..7f39fbe6075357d08d157ae0887f5b68de1d9690 100644 (file)
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -951,15 +951,10 @@ ssize_t part_stat_show(struct device *dev,
                       struct device_attribute *attr, char *buf)
 {
        struct block_device *bdev = dev_to_bdev(dev);
-       struct request_queue *q = bdev_get_queue(bdev);
        struct disk_stats stat;
        unsigned int inflight;
 
-       if (queue_is_mq(q))
-               inflight = blk_mq_in_flight(q, bdev);
-       else
-               inflight = part_in_flight(bdev);
-
+       inflight = part_in_flight(bdev);
        if (inflight) {
                part_stat_lock();
                update_io_ticks(bdev, jiffies, true);
@@ -1256,11 +1251,8 @@ static int diskstats_show(struct seq_file *seqf, void *v)
        xa_for_each(&gp->part_tbl, idx, hd) {
                if (bdev_is_partition(hd) && !bdev_nr_sectors(hd))
                        continue;
-               if (queue_is_mq(gp->queue))
-                       inflight = blk_mq_in_flight(gp->queue, hd);
-               else
-                       inflight = part_in_flight(hd);
 
+               inflight = part_in_flight(hd);
                if (inflight) {
                        part_stat_lock();
                        update_io_ticks(hd, jiffies, true);