| Message ID | 20240123-vfs-bdev-file-v2-22-adbd023e19cc@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Open block devices as files | expand |
On Tue 23-01-24 14:26:39, Christian Brauner wrote: > Signed-off-by: Christian Brauner <brauner@kernel.org> Looks good. Feel free to add: Reviewed-by: Jan Kara <jack@suse.cz> Honza > --- > fs/f2fs/f2fs.h | 2 +- > fs/f2fs/super.c | 12 ++++++------ > 2 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h > index 65294e3b0bef..6fc172c99915 100644 > --- a/fs/f2fs/f2fs.h > +++ b/fs/f2fs/f2fs.h > @@ -1239,7 +1239,7 @@ struct f2fs_bio_info { > #define FDEV(i) (sbi->devs[i]) > #define RDEV(i) (raw_super->devs[i]) > struct f2fs_dev_info { > - struct bdev_handle *bdev_handle; > + struct file *bdev_file; > struct block_device *bdev; > char path[MAX_PATH_LEN]; > unsigned int total_segments; > diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c > index ea94c148fee5..557ea5c6c926 100644 > --- a/fs/f2fs/super.c > +++ b/fs/f2fs/super.c > @@ -1605,7 +1605,7 @@ static void destroy_device_list(struct f2fs_sb_info *sbi) > > for (i = 0; i < sbi->s_ndevs; i++) { > if (i > 0) > - bdev_release(FDEV(i).bdev_handle); > + fput(FDEV(i).bdev_file); > #ifdef CONFIG_BLK_DEV_ZONED > kvfree(FDEV(i).blkz_seq); > #endif > @@ -4247,7 +4247,7 @@ static int f2fs_scan_devices(struct f2fs_sb_info *sbi) > > for (i = 0; i < max_devices; i++) { > if (i == 0) > - FDEV(0).bdev_handle = sb_bdev_handle(sbi->sb); > + FDEV(0).bdev_file = sbi->sb->s_bdev_file; > else if (!RDEV(i).path[0]) > break; > > @@ -4267,14 +4267,14 @@ static int f2fs_scan_devices(struct f2fs_sb_info *sbi) > FDEV(i).end_blk = FDEV(i).start_blk + > (FDEV(i).total_segments << > sbi->log_blocks_per_seg) - 1; > - FDEV(i).bdev_handle = bdev_open_by_path( > + FDEV(i).bdev_file = bdev_file_open_by_path( > FDEV(i).path, mode, sbi->sb, NULL); > } > } > - if (IS_ERR(FDEV(i).bdev_handle)) > - return PTR_ERR(FDEV(i).bdev_handle); > + if (IS_ERR(FDEV(i).bdev_file)) > + return PTR_ERR(FDEV(i).bdev_file); > > - FDEV(i).bdev = FDEV(i).bdev_handle->bdev; > + FDEV(i).bdev = file_bdev(FDEV(i).bdev_file); > /* to release errored devices */ > sbi->s_ndevs = i + 1; > > > -- > 2.43.0 >
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 65294e3b0bef..6fc172c99915 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -1239,7 +1239,7 @@ struct f2fs_bio_info { #define FDEV(i) (sbi->devs[i]) #define RDEV(i) (raw_super->devs[i]) struct f2fs_dev_info { - struct bdev_handle *bdev_handle; + struct file *bdev_file; struct block_device *bdev; char path[MAX_PATH_LEN]; unsigned int total_segments; diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index ea94c148fee5..557ea5c6c926 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -1605,7 +1605,7 @@ static void destroy_device_list(struct f2fs_sb_info *sbi) for (i = 0; i < sbi->s_ndevs; i++) { if (i > 0) - bdev_release(FDEV(i).bdev_handle); + fput(FDEV(i).bdev_file); #ifdef CONFIG_BLK_DEV_ZONED kvfree(FDEV(i).blkz_seq); #endif @@ -4247,7 +4247,7 @@ static int f2fs_scan_devices(struct f2fs_sb_info *sbi) for (i = 0; i < max_devices; i++) { if (i == 0) - FDEV(0).bdev_handle = sb_bdev_handle(sbi->sb); + FDEV(0).bdev_file = sbi->sb->s_bdev_file; else if (!RDEV(i).path[0]) break; @@ -4267,14 +4267,14 @@ static int f2fs_scan_devices(struct f2fs_sb_info *sbi) FDEV(i).end_blk = FDEV(i).start_blk + (FDEV(i).total_segments << sbi->log_blocks_per_seg) - 1; - FDEV(i).bdev_handle = bdev_open_by_path( + FDEV(i).bdev_file = bdev_file_open_by_path( FDEV(i).path, mode, sbi->sb, NULL); } } - if (IS_ERR(FDEV(i).bdev_handle)) - return PTR_ERR(FDEV(i).bdev_handle); + if (IS_ERR(FDEV(i).bdev_file)) + return PTR_ERR(FDEV(i).bdev_file); - FDEV(i).bdev = FDEV(i).bdev_handle->bdev; + FDEV(i).bdev = file_bdev(FDEV(i).bdev_file); /* to release errored devices */ sbi->s_ndevs = i + 1;
Signed-off-by: Christian Brauner <brauner@kernel.org> --- fs/f2fs/f2fs.h | 2 +- fs/f2fs/super.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-)