tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Jan Kara and committed by
Christian Brauner 2b107946 d577c8aa

+8 -6
+1
fs/f2fs/f2fs.h
··· 1234 1234 #define FDEV(i) (sbi->devs[i]) 1235 1235 #define RDEV(i) (raw_super->devs[i]) 1236 1236 struct f2fs_dev_info { 1237 + struct bdev_handle *bdev_handle; 1237 1238 struct block_device *bdev; 1238 1239 char path[MAX_PATH_LEN]; 1239 1240 unsigned int total_segments;
+7 -6
fs/f2fs/super.c
··· 1562 1562 1563 1563 for (i = 0; i < sbi->s_ndevs; i++) { 1564 1564 if (i > 0) 1565 - blkdev_put(FDEV(i).bdev, sbi->sb); 1565 + bdev_release(FDEV(i).bdev_handle); 1566 1566 #ifdef CONFIG_BLK_DEV_ZONED 1567 1567 kvfree(FDEV(i).blkz_seq); 1568 1568 #endif ··· 4198 4198 4199 4199 for (i = 0; i < max_devices; i++) { 4200 4200 if (i == 0) 4201 - FDEV(0).bdev = sbi->sb->s_bdev; 4201 + FDEV(0).bdev_handle = sbi->sb->s_bdev_handle; 4202 4202 else if (!RDEV(i).path[0]) 4203 4203 break; 4204 4204 ··· 4218 4218 FDEV(i).end_blk = FDEV(i).start_blk + 4219 4219 (FDEV(i).total_segments << 4220 4220 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); 4223 4223 } 4224 4224 } 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); 4227 4227 4228 + FDEV(i).bdev = FDEV(i).bdev_handle->bdev; 4228 4229 /* to release errored devices */ 4229 4230 sbi->s_ndevs = i + 1; 4230 4231