block: return just one value from part_in_flight

The previous patches deleted all the code that needed the second value
returned from part_in_flight - now the kernel only uses the first value.

Consequently, part_in_flight (and blk_mq_in_flight) may be changed so that
it only returns one value.

This patch just refactors the code, there's no functional change.

Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

1 files changed, 3 insertions, 3 deletions

diff --git a/block/partition-generic.c b/block/partition-generic.c
index 42d6138ac876..8e596a8dff32 100644
--- a/block/partition-generic.c
+++ b/block/partition-generic.c
@@ -120,9 +120,9 @@ ssize_t part_stat_show(struct device *dev,
 {
         struct hd_struct *p = dev_to_part(dev);
         struct request_queue *q = part_to_disk(p)->queue;
-        unsigned int inflight[2];
+        unsigned int inflight;
 
-        part_in_flight(q, p, inflight);
+        inflight = part_in_flight(q, p);
         return sprintf(buf,
                 "%8lu %8lu %8llu %8u "
                 "%8lu %8lu %8llu %8u "
@@ -137,7 +137,7 @@ ssize_t part_stat_show(struct device *dev,
                 part_stat_read(p, merges[STAT_WRITE]),
                 (unsigned long long)part_stat_read(p, sectors[STAT_WRITE]),
                 (unsigned int)part_stat_read_msecs(p, STAT_WRITE),
-                inflight[0],
+                inflight,
                 jiffies_to_msecs(part_stat_read(p, io_ticks)),
                 jiffies_to_msecs(part_stat_read(p, time_in_queue)),
                 part_stat_read(p, ios[STAT_DISCARD]),