erofs: Convert to use bdev_open_by_path()

Convert erofs to use bdev_open_by_path() and pass the handle around.

CC: Gao Xiang <xiang@kernel.org>
CC: Chao Yu <chao@kernel.org>
CC: linux-erofs@lists.ozlabs.org
Acked-by: Christoph Hellwig <hch@lst.de>
Acked-by: Gao Xiang <hsiangkao@linux.alibaba.com>
Reviewed-by: Christian Brauner <brauner@kernel.org>
Signed-off-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20230927093442.25915-21-jack@suse.cz
Signed-off-by: Christian Brauner <brauner@kernel.org>

diff --git a/fs/erofs/data.c b/fs/erofs/data.c
index 0c2c99c58b5e3aa2524e1b17506b117624772c4d..f6a0a17485218d2ce76dfbf6242aa78c64ede39a 100644 (file)
--- a/fs/erofs/data.c
+++ b/fs/erofs/data.c
@@ -222,7 +222,7 @@ int erofs_map_dev(struct super_block *sb, struct erofs_map_dev *map)
                        up_read(&devs->rwsem);
                        return 0;
                }
-               map->m_bdev = dif->bdev;
+               map->m_bdev = dif->bdev_handle->bdev;
                map->m_daxdev = dif->dax_dev;
                map->m_dax_part_off = dif->dax_part_off;
                map->m_fscache = dif->fscache;
@@ -240,7 +240,7 @@ int erofs_map_dev(struct super_block *sb, struct erofs_map_dev *map)
                        if (map->m_pa >= startoff &&
                            map->m_pa < startoff + length) {
                                map->m_pa -= startoff;
-                               map->m_bdev = dif->bdev;
+                               map->m_bdev = dif->bdev_handle->bdev;
                                map->m_daxdev = dif->dax_dev;
                                map->m_dax_part_off = dif->dax_part_off;
                                map->m_fscache = dif->fscache;

diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h
index 4ff88d0dd980fbd5998c79c71c7a89c129050fb8..cf04e21bfda2879ce1c2950ad793b155e460e8da 100644 (file)
--- a/fs/erofs/internal.h
+++ b/fs/erofs/internal.h
@@ -47,7 +47,7 @@ typedef u32 erofs_blk_t;
 struct erofs_device_info {
        char *path;
        struct erofs_fscache *fscache;
-       struct block_device *bdev;
+       struct bdev_handle *bdev_handle;
        struct dax_device *dax_dev;
        u64 dax_part_off;
 

diff --git a/fs/erofs/super.c b/fs/erofs/super.c
index 3700af9ee17332f4f6ea766ba3297cdd1e3746fc..6fd04781fec5446a983f64c4bf878e4beed51f91 100644 (file)
--- a/fs/erofs/super.c
+++ b/fs/erofs/super.c
@@ -227,7 +227,7 @@ static int erofs_init_device(struct erofs_buf *buf, struct super_block *sb,
        struct erofs_sb_info *sbi = EROFS_SB(sb);
        struct erofs_fscache *fscache;
        struct erofs_deviceslot *dis;
-       struct block_device *bdev;
+       struct bdev_handle *bdev_handle;
        void *ptr;
 
        ptr = erofs_read_metabuf(buf, sb, erofs_blknr(sb, *pos), EROFS_KMAP);
@@ -251,13 +251,13 @@ static int erofs_init_device(struct erofs_buf *buf, struct super_block *sb,
                        return PTR_ERR(fscache);
                dif->fscache = fscache;
        } else if (!sbi->devs->flatdev) {
-               bdev = blkdev_get_by_path(dif->path, BLK_OPEN_READ, sb->s_type,
-                                         NULL);
-               if (IS_ERR(bdev))
-                       return PTR_ERR(bdev);
-               dif->bdev = bdev;
-               dif->dax_dev = fs_dax_get_by_bdev(bdev, &dif->dax_part_off,
-                                                 NULL, NULL);
+               bdev_handle = bdev_open_by_path(dif->path, BLK_OPEN_READ,
+                                               sb->s_type, NULL);
+               if (IS_ERR(bdev_handle))
+                       return PTR_ERR(bdev_handle);
+               dif->bdev_handle = bdev_handle;
+               dif->dax_dev = fs_dax_get_by_bdev(bdev_handle->bdev,
+                               &dif->dax_part_off, NULL, NULL);
        }
 
        dif->blocks = le32_to_cpu(dis->blocks);
@@ -806,8 +806,8 @@ static int erofs_release_device_info(int id, void *ptr, void *data)
        struct erofs_device_info *dif = ptr;
 
        fs_put_dax(dif->dax_dev, NULL);
-       if (dif->bdev)
-               blkdev_put(dif->bdev, &erofs_fs_type);
+       if (dif->bdev_handle)
+               bdev_release(dif->bdev_handle);
        erofs_fscache_unregister_cookie(dif->fscache);
        dif->fscache = NULL;
        kfree(dif->path);