diff mbox series

[22/32] erofs: Convert to use blkdev_get_handle_by_path()

Message ID 20230704122224.16257-22-jack@suse.cz (mailing list archive)
State New, archived
Headers show
Series block: Make blkdev_get_by_*() return handle | expand

Commit Message

Jan Kara July 4, 2023, 12:21 p.m. UTC 
Convert erofs to use blkdev_get_handle_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
Signed-off-by: Jan Kara <jack@suse.cz>
---
 fs/erofs/data.c     |  4 ++--
 fs/erofs/internal.h |  2 +-
 fs/erofs/super.c    | 20 ++++++++++----------
 3 files changed, 13 insertions(+), 13 deletions(-)

Comments

Gao Xiang July 6, 2023, 3:16 p.m. UTC | #1 
On 2023/7/4 20:21, Jan Kara wrote:
> Convert erofs to use blkdev_get_handle_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
> Signed-off-by: Jan Kara <jack@suse.cz>

Thanks for this:
Acked-by: Gao Xiang <hsiangkao@linux.alibaba.com>

Thanks,
Gao Xiang

> ---
>   fs/erofs/data.c     |  4 ++--
>   fs/erofs/internal.h |  2 +-
>   fs/erofs/super.c    | 20 ++++++++++----------
>   3 files changed, 13 insertions(+), 13 deletions(-)
> 
> diff --git a/fs/erofs/data.c b/fs/erofs/data.c
> index db5e4b7636ec..1fa60cfff267 100644
> --- 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 36e32fa542f0..fabd3bb0c194 100644
> --- 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 9d6a3c6158bd..a4742cc05f95 100644
> --- a/fs/erofs/super.c
> +++ b/fs/erofs/super.c
> @@ -230,7 +230,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);
> @@ -254,13 +254,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 = blkdev_get_handle_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);
> @@ -815,8 +815,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)
> +		blkdev_handle_put(dif->bdev_handle);
>   	erofs_fscache_unregister_cookie(dif->fscache);
>   	dif->fscache = NULL;
>   	kfree(dif->path);
diff mbox series

Patch

diff --git a/fs/erofs/data.c b/fs/erofs/data.c
index db5e4b7636ec..1fa60cfff267 100644
--- 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 36e32fa542f0..fabd3bb0c194 100644
--- 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 9d6a3c6158bd..a4742cc05f95 100644
--- a/fs/erofs/super.c
+++ b/fs/erofs/super.c
@@ -230,7 +230,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);
@@ -254,13 +254,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 = blkdev_get_handle_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);
@@ -815,8 +815,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)
+		blkdev_handle_put(dif->bdev_handle);
 	erofs_fscache_unregister_cookie(dif->fscache);
 	dif->fscache = NULL;
 	kfree(dif->path);