dm-crypt: use __bio_add_page to add single page to clone bio

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

diff --git a/block/ioctl.c b/block/ioctl.c
index 96617512982e57d98a6372400df94114fe4c2447..9c5f637ff153f8b0010a6812ab8565fdacfbc5fe 100644 (file)
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@ -467,10 +467,10 @@ static int blkdev_bszset(struct block_device *bdev, fmode_t mode,
  * user space. Note the separate arg/argp parameters that are needed
  * to deal with the compat_ptr() conversion.
  */
-static int blkdev_common_ioctl(struct file *file, fmode_t mode, unsigned cmd,
-                              unsigned long arg, void __user *argp)
+static int blkdev_common_ioctl(struct block_device *bdev, fmode_t mode,
+                              unsigned int cmd, unsigned long arg,
+                              void __user *argp)
 {
-       struct block_device *bdev = I_BDEV(file->f_mapping->host);
        unsigned int max_sectors;
 
        switch (cmd) {
@@ -528,8 +528,7 @@ static int blkdev_common_ioctl(struct file *file, fmode_t mode, unsigned cmd,
                        return -EACCES;
                if (bdev_is_partition(bdev))
                        return -EINVAL;
-               return disk_scan_partitions(bdev->bd_disk, mode & ~FMODE_EXCL,
-                                           file);
+               return disk_scan_partitions(bdev->bd_disk, mode);
        case BLKTRACESTART:
        case BLKTRACESTOP:
        case BLKTRACETEARDOWN:
@@ -607,7 +606,7 @@ long blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg)
                break;
        }
 
-       ret = blkdev_common_ioctl(file, mode, cmd, arg, argp);
+       ret = blkdev_common_ioctl(bdev, mode, cmd, arg, argp);
        if (ret != -ENOIOCTLCMD)
                return ret;
 
@@ -676,7 +675,7 @@ long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg)
                break;
        }
 
-       ret = blkdev_common_ioctl(file, mode, cmd, arg, argp);
+       ret = blkdev_common_ioctl(bdev, mode, cmd, arg, argp);
        if (ret == -ENOIOCTLCMD && disk->fops->compat_ioctl)
                ret = disk->fops->compat_ioctl(bdev, mode, cmd, arg);