Unverified Commit f4a48bc3 authored by Jan Kara's avatar Jan Kara Committed by Christian Brauner
Browse files

fs: Convert to bdev_open_by_dev() 



Convert mount code to use bdev_open_by_dev() and propagate the handle
around to bdev_release().

Acked-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarChristian Brauner <brauner@kernel.org>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20230927093442.25915-19-jack@suse.cz


Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent 4c6bca43

fs/cramfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -495,7 +495,7 @@ static void cramfs_kill_sb(struct super_block *sb) 
		sb->s_mtd = NULL;

	} else if (IS_ENABLED(CONFIG_CRAMFS_BLOCKDEV) && sb->s_bdev) {

		sync_blockdev(sb->s_bdev);

		blkdev_put(sb->s_bdev, sb);

		bdev_release(sb->s_bdev_handle);

	}

	kfree(sbi);

}

fs/romfs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -593,7 +593,7 @@ static void romfs_kill_sb(struct super_block *sb) 
#ifdef CONFIG_ROMFS_ON_BLOCK

	if (sb->s_bdev) {

		sync_blockdev(sb->s_bdev);

		blkdev_put(sb->s_bdev, sb);

		bdev_release(sb->s_bdev_handle);

	}

#endif

}

fs/super.c

+9 −6
Original line number Diff line number Diff line
@@ -1479,14 +1479,16 @@ int setup_bdev_super(struct super_block *sb, int sb_flags, 
		struct fs_context *fc)

{

	blk_mode_t mode = sb_open_mode(sb_flags);

	struct bdev_handle *bdev_handle;

	struct block_device *bdev;



	bdev = blkdev_get_by_dev(sb->s_dev, mode, sb, &fs_holder_ops);

	if (IS_ERR(bdev)) {

	bdev_handle = bdev_open_by_dev(sb->s_dev, mode, sb, &fs_holder_ops);

	if (IS_ERR(bdev_handle)) {

		if (fc)

			errorf(fc, "%s: Can't open blockdev", fc->source);

		return PTR_ERR(bdev);

		return PTR_ERR(bdev_handle);

	}

	bdev = bdev_handle->bdev;



	/*

	 * This really should be in blkdev_get_by_dev, but right now can't due
@@ -1494,7 +1496,7 @@ int setup_bdev_super(struct super_block *sb, int sb_flags, 
	 * writable from userspace even for a read-only block device.

	 */

	if ((mode & BLK_OPEN_WRITE) && bdev_read_only(bdev)) {

		blkdev_put(bdev, sb);

		bdev_release(bdev_handle);

		return -EACCES;

	}
@@ -1510,10 +1512,11 @@ int setup_bdev_super(struct super_block *sb, int sb_flags, 
		mutex_unlock(&bdev->bd_fsfreeze_mutex);

		if (fc)

			warnf(fc, "%pg: Can't mount, blockdev is frozen", bdev);

		blkdev_put(bdev, sb);

		bdev_release(bdev_handle);

		return -EBUSY;

	}

	spin_lock(&sb_lock);

	sb->s_bdev_handle = bdev_handle;

	sb->s_bdev = bdev;

	sb->s_bdi = bdi_get(bdev->bd_disk->bdi);

	if (bdev_stable_writes(bdev))
@@ -1646,7 +1649,7 @@ void kill_block_super(struct super_block *sb) 
	generic_shutdown_super(sb);

	if (bdev) {

		sync_blockdev(bdev);

		blkdev_put(bdev, sb);

		bdev_release(sb->s_bdev_handle);

	}

}

include/linux/fs.h

+1 −0
Original line number Diff line number Diff line
@@ -1221,6 +1221,7 @@ struct super_block { 
	struct hlist_bl_head	s_roots;	/* alternate root dentries for NFS */

	struct list_head	s_mounts;	/* list of mounts; _not_ for fs use */

	struct block_device	*s_bdev;

	struct bdev_handle	*s_bdev_handle;

	struct backing_dev_info *s_bdi;

	struct mtd_info		*s_mtd;

	struct hlist_node	s_instances;