[PATCH block/for-next v2 04/16] mtd: block2mtd: use new helper to get inode from block_device

[Yu Kuai]

From: Yu Kuai <yuku...@huawei.com>

Which is more efficiency, and also prepare to remove the field
'bd_inode' from block_device.

Signed-off-by: Yu Kuai <yuku...@huawei.com>
---
 drivers/mtd/devices/block2mtd.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/mtd/devices/block2mtd.c b/drivers/mtd/devices/block2mtd.c
index aa44a23ec045..d4f7a4339a70 100644
--- a/drivers/mtd/devices/block2mtd.c
+++ b/drivers/mtd/devices/block2mtd.c
@@ -56,7 +56,7 @@ static struct page *page_read(struct address_space *mapping, 
pgoff_t index)
 static int _block2mtd_erase(struct block2mtd_dev *dev, loff_t to, size_t len)
 {
        struct address_space *mapping =
-                               dev->bdev_handle->bdev->bd_inode->i_mapping;
+                               bdev_inode(dev->bdev_handle->bdev)->i_mapping;
        struct page *page;
        pgoff_t index = to >> PAGE_SHIFT;       // page index
        int pages = len >> PAGE_SHIFT;
@@ -107,7 +107,7 @@ static int block2mtd_read(struct mtd_info *mtd, loff_t 
from, size_t len,
 {
        struct block2mtd_dev *dev = mtd->priv;
        struct address_space *mapping =
-                               dev->bdev_handle->bdev->bd_inode->i_mapping;
+                               bdev_inode(dev->bdev_handle->bdev)->i_mapping;
        struct page *page;
        pgoff_t index = from >> PAGE_SHIFT;
        int offset = from & (PAGE_SIZE-1);
@@ -143,7 +143,7 @@ static int _block2mtd_write(struct block2mtd_dev *dev, 
const u_char *buf,
 {
        struct page *page;
        struct address_space *mapping =
-                               dev->bdev_handle->bdev->bd_inode->i_mapping;
+                               bdev_inode(dev->bdev_handle->bdev)->i_mapping;
        pgoff_t index = to >> PAGE_SHIFT;       // page index
        int offset = to & ~PAGE_MASK;   // page offset
        int cpylen;
@@ -212,7 +212,7 @@ static void block2mtd_free_device(struct block2mtd_dev *dev)
 
        if (dev->bdev_handle) {
                invalidate_mapping_pages(
-                       dev->bdev_handle->bdev->bd_inode->i_mapping, 0, -1);
+                       bdev_inode(dev->bdev_handle->bdev)->i_mapping, 0, -1);
                bdev_release(dev->bdev_handle);
        }
 
@@ -295,7 +295,7 @@ static struct block2mtd_dev *add_device(char *devname, int 
erase_size,
                goto err_free_block2mtd;
        }
 
-       if ((long)bdev->bd_inode->i_size % erase_size) {
+       if ((long)bdev_inode(bdev)->i_size % erase_size) {
                pr_err("erasesize must be a divisor of device size\n");
                goto err_free_block2mtd;
        }
@@ -313,7 +313,7 @@ static struct block2mtd_dev *add_device(char *devname, int 
erase_size,
 
        dev->mtd.name = name;
 
-       dev->mtd.size = bdev->bd_inode->i_size & PAGE_MASK;
+       dev->mtd.size = bdev_inode(bdev)->i_size & PAGE_MASK;
        dev->mtd.erasesize = erase_size;
        dev->mtd.writesize = 1;
        dev->mtd.writebufsize = PAGE_SIZE;
-- 
2.39.2