korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 04:18:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

block: simplify diskstats_show

Browse Source 
Just use xa_for_each to iterate over the partitions as there is no need
to grab a reference to each partition.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20210406062303.811835-11-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2021-04-06 08:23:01 +02:00 committed by Jens Axboe
parent ecc75a98b8
commit 7fae67cc9c
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
block/genhd.c
View File

@ -1236,11 +1236,11 @@ const struct device_type disk_type = {
static int diskstats_show(struct seq_file *seqf, void *v) static int diskstats_show(struct seq_file *seqf, void *v)
{ {
struct gendisk *gp = v; struct gendisk *gp = v;
struct disk_part_iter piter;
struct block_device *hd; struct block_device *hd;
char buf[BDEVNAME_SIZE]; char buf[BDEVNAME_SIZE];
unsigned int inflight; unsigned int inflight;
struct disk_stats stat; struct disk_stats stat;
unsigned long idx;
/* /*
if (&disk_to_dev(gp)->kobj.entry == block_class.devices.next) if (&disk_to_dev(gp)->kobj.entry == block_class.devices.next)
@ -1250,8 +1250,10 @@ static int diskstats_show(struct seq_file *seqf, void *v)
"\n\n"); "\n\n");
*/ */
disk_part_iter_init(&piter, gp, DISK_PITER_INCL_EMPTY_PART0); rcu_read_lock();
while ((hd = disk_part_iter_next(&piter))) { xa_for_each(&gp->part_tbl, idx, hd) {
if (bdev_is_partition(hd) && !bdev_nr_sectors(hd))
continue;
part_stat_read_all(hd, &stat); part_stat_read_all(hd, &stat);
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);
@ -1294,7 +1296,7 @@ static int diskstats_show(struct seq_file *seqf, void *v)
NSEC_PER_MSEC) NSEC_PER_MSEC)
); );
} }
disk_part_iter_exit(&piter); rcu_read_unlock();
return 0; return 0;
} }