diff options
| author |   Christoph Hellwig <hch@lst.de> | 2020-05-27 07:24:14 +0200 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2020-05-27 05:21:23 -0600 |
| commit | 58d4f14fc30ac26288cfed74d7e566921c22cf59 (patch) | |
| tree | b55c90cab60c05e5bc5676d45110827a3818a23b /include/linux/genhd.h | |
| parent | block: move update_io_ticks to blk-core.c (diff) | |
| download | wireguard-linux-58d4f14fc30ac26288cfed74d7e566921c22cf59.tar.xz wireguard-linux-58d4f14fc30ac26288cfed74d7e566921c22cf59.zip | |
block: always use a percpu variable for disk stats
percpu variables have a perfectly fine working stub implementation
for UP kernels, so use that.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'include/linux/genhd.h')
| -rw-r--r-- | include/linux/genhd.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/include/linux/genhd.h b/include/linux/genhd.h index a9384449465a..f0d6d77309a5 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h @@ -39,15 +39,6 @@ extern struct class block_class; #include <linux/fs.h> #include <linux/workqueue.h> -struct disk_stats { - u64 nsecs[NR_STAT_GROUPS]; - unsigned long sectors[NR_STAT_GROUPS]; - unsigned long ios[NR_STAT_GROUPS]; - unsigned long merges[NR_STAT_GROUPS]; - unsigned long io_ticks; - local_t in_flight[2]; -}; - #define PARTITION_META_INFO_VOLNAMELTH 64 /* * Enough for the string representation of any kind of UUID plus NULL. @@ -72,11 +63,7 @@ struct hd_struct { seqcount_t nr_sects_seq; #endif unsigned long stamp; -#ifdef CONFIG_SMP struct disk_stats __percpu *dkstats; -#else - struct disk_stats dkstats; -#endif struct percpu_ref ref; sector_t alignment_offset; |