block/ioctl: port blkdev_bszset() to file

[thirdparty/kernel/stable.git] / block / ioctl.c

diff --git a/block/ioctl.c b/block/ioctl.c
index 9c73a763ef8838953bd1050b505621c39b8d4cdb..5d0619e02e4ca93ca7de55dce0acd10474c462e6 100644 (file)
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@ -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;
 }