Merge tag 'vfs-6.9.super' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs

[linux-block.git] / block / ioctl.c

diff --git a/block/ioctl.c b/block/ioctl.c
index 438f79c564cfc05d6f525550417eeee93c7b82bb..4c8aebee595f8a23e9640d08af293eb60b141373 100644 (file)
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@ -469,7 +469,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;
@@ -481,12 +481,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;
 }