diff options
| author | Mike Snitzer <snitzer@redhat.com> | 2018-12-06 11:41:18 -0500 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-12-10 08:30:37 -0700 |
| commit | 112f158f66cbe25fd561a5dfe9c3826e06abf757 (patch) | |
| tree | 192a838ddd4e61581e6be953dc843d84730de6e8 /block/genhd.c | |
| parent | dbd3bbd291a03f1383de6242e7999e8487cb869b (diff) | |
| download | lwn-112f158f66cbe25fd561a5dfe9c3826e06abf757.tar.gz lwn-112f158f66cbe25fd561a5dfe9c3826e06abf757.zip | |
block: stop passing 'cpu' to all percpu stats methods
All of part_stat_* and related methods are used with preempt disabled,
so there is no need to pass cpu around to allow of them. Just call
smp_processor_id() as needed.
Suggested-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/genhd.c')
| -rw-r--r-- | block/genhd.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/block/genhd.c b/block/genhd.c index 0145bcb0cc76..2fe00cf32b93 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -1326,7 +1326,6 @@ static int diskstats_show(struct seq_file *seqf, void *v) struct hd_struct *hd; char buf[BDEVNAME_SIZE]; unsigned int inflight[2]; - int cpu; /* if (&disk_to_dev(gp)->kobj.entry == block_class.devices.next) @@ -1338,8 +1337,8 @@ static int diskstats_show(struct seq_file *seqf, void *v) disk_part_iter_init(&piter, gp, DISK_PITER_INCL_EMPTY_PART0); while ((hd = disk_part_iter_next(&piter))) { - cpu = part_stat_lock(); - part_round_stats(gp->queue, cpu, hd); + part_stat_lock(); + part_round_stats(gp->queue, hd); part_stat_unlock(); part_in_flight(gp->queue, hd, inflight); seq_printf(seqf, "%4d %7d %s " |