[PATCH 05/29] mtd/block2mtd: use bdev_nr_sectors instead of open coding it
From: Christoph Hellwig <hch@lst.de>
Date: 2021-10-13 05:19:28
Also in:
dm-devel, linux-bcache, linux-block, linux-btrfs, linux-ext4, linux-fsdevel, linux-nfs, linux-nvme, linux-scsi, ntfs3, target-devel
Subsystem:
block2mtd driver, memory technology devices (mtd), the rest · Maintainers:
Joern Engel, Miquel Raynal, Richard Weinberger, Vignesh Raghavendra, Linus Torvalds
Use the proper helper to read the block device size. Signed-off-by: Christoph Hellwig <hch@lst.de> --- drivers/mtd/devices/block2mtd.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/mtd/devices/block2mtd.c b/drivers/mtd/devices/block2mtd.c
index c08721b11642b..d2d1a712188ce 100644
--- a/drivers/mtd/devices/block2mtd.c
+++ b/drivers/mtd/devices/block2mtd.c@@ -269,7 +269,7 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size, goto err_free_block2mtd; } - if ((long)dev->blkdev->bd_inode->i_size % erase_size) { + if ((long)(bdev_nr_sectors(dev->blkdev) << SECTOR_SHIFT) % erase_size) { pr_err("erasesize must be a divisor of device size\n"); goto err_free_block2mtd; }
@@ -284,7 +284,8 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size, dev->mtd.name = name; - dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK; + dev->mtd.size = + (bdev_nr_sectors(dev->blkdev) << SECTOR_SHIFT) & PAGE_MASK; dev->mtd.erasesize = erase_size; dev->mtd.writesize = 1; dev->mtd.writebufsize = PAGE_SIZE;
--
2.30.2