Unverified Commit e5ca9d39 authored by Christian Brauner's avatar Christian Brauner
Browse files

block/ioctl: port blkdev_bszset() to file 

Link: https://lore.kernel.org/r/20240123-vfs-bdev-file-v2-2-adbd023e19cc@kernel.org


Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent f3a60882

block/ioctl.c

+4 −5
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ static int blkdev_bszset(struct block_device *bdev, blk_mode_t mode, 
		int __user *argp)

{

	int ret, n;

	struct bdev_handle *handle;

	struct file *file;



	if (!capable(CAP_SYS_ADMIN))

		return -EACCES;
@@ -483,12 +483,11 @@ static int blkdev_bszset(struct block_device *bdev, blk_mode_t mode, 
	if (mode & BLK_OPEN_EXCL)

		return set_blocksize(bdev, n);



	handle = bdev_open_by_dev(bdev->bd_dev, mode, &bdev, NULL);

	if (IS_ERR(handle))

	file = bdev_file_open_by_dev(bdev->bd_dev, mode, &bdev, NULL);

	if (IS_ERR(file))

		return -EBUSY;

	ret = set_blocksize(bdev, n);

	bdev_release(handle);



	fput(file);

	return ret;

}