diff options
| author | Christoph Hellwig <hch@lst.de> | 2020-11-24 09:34:00 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-12-01 22:53:40 +0100 |
| commit | 15e3d2c5cd53298272e59ad9072d3468f9dd3781 (patch) | |
| tree | e526446b6b09c036e9aed966dbe2bdd252f5bb98 /fs/block_dev.c | |
| parent | block: remove the nr_sects field in struct hd_struct (diff) | |
| download | linux-15e3d2c5cd53298272e59ad9072d3468f9dd3781.tar.xz linux-15e3d2c5cd53298272e59ad9072d3468f9dd3781.zip | |
block: move disk stat accounting to struct block_device
Move the dkstats and stamp field to struct block_device in preparation
of killing struct hd_struct.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jan Kara <jack@suse.cz>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs/block_dev.c')
| -rw-r--r-- | fs/block_dev.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/fs/block_dev.c b/fs/block_dev.c index 31ee5a857f71..0832c7830f3a 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -32,6 +32,7 @@ #include <linux/cleancache.h> #include <linux/task_io_accounting_ops.h> #include <linux/falloc.h> +#include <linux/part_stat.h> #include <linux/uaccess.h> #include <linux/suspend.h> #include "internal.h" @@ -781,6 +782,10 @@ static struct inode *bdev_alloc_inode(struct super_block *sb) static void bdev_free_inode(struct inode *inode) { + struct block_device *bdev = I_BDEV(inode); + + free_percpu(bdev->bd_stats); + kmem_cache_free(bdev_cachep, BDEV_I(inode)); } @@ -875,6 +880,11 @@ struct block_device *bdev_alloc(struct gendisk *disk, u8 partno) #ifdef CONFIG_SYSFS INIT_LIST_HEAD(&bdev->bd_holder_disks); #endif + bdev->bd_stats = alloc_percpu(struct disk_stats); + if (!bdev->bd_stats) { + iput(inode); + return NULL; + } return bdev; } |