block: remove the unused q argument to part_in_flight and part_in_flight_rw

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig
2020-08-31 20:02:39 +02:00
committed by Jens Axboe
parent 8328eb2836
commit 1f06959bd2

View File

@ -110,8 +110,7 @@ static void part_stat_read_all(struct hd_struct *part, struct disk_stats *stat)
} }
} }
static unsigned int part_in_flight(struct request_queue *q, static unsigned int part_in_flight(struct hd_struct *part)
struct hd_struct *part)
{ {
unsigned int inflight = 0; unsigned int inflight = 0;
int cpu; int cpu;
@ -126,8 +125,7 @@ static unsigned int part_in_flight(struct request_queue *q,
return inflight; return inflight;
} }
static void part_in_flight_rw(struct request_queue *q, struct hd_struct *part, static void part_in_flight_rw(struct hd_struct *part, unsigned int inflight[2])
unsigned int inflight[2])
{ {
int cpu; int cpu;
@ -1301,7 +1299,7 @@ ssize_t part_stat_show(struct device *dev,
if (queue_is_mq(q)) if (queue_is_mq(q))
inflight = blk_mq_in_flight(q, p); inflight = blk_mq_in_flight(q, p);
else else
inflight = part_in_flight(q, p); inflight = part_in_flight(p);
return sprintf(buf, return sprintf(buf,
"%8lu %8lu %8llu %8u " "%8lu %8lu %8llu %8u "
@ -1343,7 +1341,7 @@ ssize_t part_inflight_show(struct device *dev, struct device_attribute *attr,
if (queue_is_mq(q)) if (queue_is_mq(q))
blk_mq_in_flight_rw(q, p, inflight); blk_mq_in_flight_rw(q, p, inflight);
else else
part_in_flight_rw(q, p, inflight); part_in_flight_rw(p, inflight);
return sprintf(buf, "%8u %8u\n", inflight[0], inflight[1]); return sprintf(buf, "%8u %8u\n", inflight[0], inflight[1]);
} }
@ -1623,7 +1621,7 @@ static int diskstats_show(struct seq_file *seqf, void *v)
if (queue_is_mq(gp->queue)) if (queue_is_mq(gp->queue))
inflight = blk_mq_in_flight(gp->queue, hd); inflight = blk_mq_in_flight(gp->queue, hd);
else else
inflight = part_in_flight(gp->queue, hd); inflight = part_in_flight(hd);
seq_printf(seqf, "%4d %7d %s " seq_printf(seqf, "%4d %7d %s "
"%lu %lu %lu %u " "%lu %lu %lu %u "