]> www.infradead.org Git - users/hch/block.git/commitdiff
mtd/block2mtd: use bdev_nr_sectors instead of open coding it
authorChristoph Hellwig <hch@lst.de>
Mon, 11 Oct 2021 11:25:32 +0000 (13:25 +0200)
committerChristoph Hellwig <hch@lst.de>
Tue, 12 Oct 2021 08:29:29 +0000 (10:29 +0200)
Use the proper helper to read the block device size.

Signed-off-by: Christoph Hellwig <hch@lst.de>
drivers/mtd/devices/block2mtd.c

index c08721b11642be1fbee5fed6601884106dbd3953..9587d205be1d898d3332a0f714a4999004c09e55 100644 (file)
@@ -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 ((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;