Skip to content

Commit 2b10794

Browse files
jankarabrauner
authored andcommitted
f2fs: Convert to bdev_open_by_dev/path()
Convert f2fs to use bdev_open_by_dev/path() and pass the handle around. CC: Jaegeuk Kim <jaegeuk@kernel.org> CC: Chao Yu <chao@kernel.org> CC: linux-f2fs-devel@lists.sourceforge.net Acked-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Christian Brauner <brauner@kernel.org> Signed-off-by: Jan Kara <jack@suse.cz> Link: https://lore.kernel.org/r/20230927093442.25915-23-jack@suse.cz Signed-off-by: Christian Brauner <brauner@kernel.org>
1 parent d577c8a commit 2b10794

2 files changed

Lines changed: 8 additions & 6 deletions

File tree

fs/f2fs/f2fs.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1234,6 +1234,7 @@ struct f2fs_bio_info {
12341234
#define FDEV(i) (sbi->devs[i])
12351235
#define RDEV(i) (raw_super->devs[i])
12361236
struct f2fs_dev_info {
1237+
struct bdev_handle *bdev_handle;
12371238
struct block_device *bdev;
12381239
char path[MAX_PATH_LEN];
12391240
unsigned int total_segments;

fs/f2fs/super.c

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1562,7 +1562,7 @@ static void destroy_device_list(struct f2fs_sb_info *sbi)
15621562

15631563
for (i = 0; i < sbi->s_ndevs; i++) {
15641564
if (i > 0)
1565-
blkdev_put(FDEV(i).bdev, sbi->sb);
1565+
bdev_release(FDEV(i).bdev_handle);
15661566
#ifdef CONFIG_BLK_DEV_ZONED
15671567
kvfree(FDEV(i).blkz_seq);
15681568
#endif
@@ -4198,7 +4198,7 @@ static int f2fs_scan_devices(struct f2fs_sb_info *sbi)
41984198

41994199
for (i = 0; i < max_devices; i++) {
42004200
if (i == 0)
4201-
FDEV(0).bdev = sbi->sb->s_bdev;
4201+
FDEV(0).bdev_handle = sbi->sb->s_bdev_handle;
42024202
else if (!RDEV(i).path[0])
42034203
break;
42044204

@@ -4218,13 +4218,14 @@ static int f2fs_scan_devices(struct f2fs_sb_info *sbi)
42184218
FDEV(i).end_blk = FDEV(i).start_blk +
42194219
(FDEV(i).total_segments <<
42204220
sbi->log_blocks_per_seg) - 1;
4221-
FDEV(i).bdev = blkdev_get_by_path(FDEV(i).path,
4222-
mode, sbi->sb, NULL);
4221+
FDEV(i).bdev_handle = bdev_open_by_path(
4222+
FDEV(i).path, mode, sbi->sb, NULL);
42234223
}
42244224
}
4225-
if (IS_ERR(FDEV(i).bdev))
4226-
return PTR_ERR(FDEV(i).bdev);
4225+
if (IS_ERR(FDEV(i).bdev_handle))
4226+
return PTR_ERR(FDEV(i).bdev_handle);
42274227

4228+
FDEV(i).bdev = FDEV(i).bdev_handle->bdev;
42284229
/* to release errored devices */
42294230
sbi->s_ndevs = i + 1;
42304231

0 commit comments

Comments
 (0)