spi: Add support pl022 spi driver

[platform/kernel/linux-starfive.git] / block / ioctl.c

diff --git a/block/ioctl.c b/block/ioctl.c
index 60121e8..9c5f637 100644 (file)
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@ -468,7 +468,8 @@ static int blkdev_bszset(struct block_device *bdev, fmode_t mode,
  * to deal with the compat_ptr() conversion.
  */
 static int blkdev_common_ioctl(struct block_device *bdev, fmode_t mode,
-                               unsigned cmd, unsigned long arg, void __user *argp)
+                              unsigned int cmd, unsigned long arg,
+                              void __user *argp)
 {
        unsigned int max_sectors;
 
@@ -527,7 +528,7 @@ static int blkdev_common_ioctl(struct block_device *bdev, fmode_t mode,
                        return -EACCES;
                if (bdev_is_partition(bdev))
                        return -EINVAL;
-               return disk_scan_partitions(bdev->bd_disk, mode & ~FMODE_EXCL);
+               return disk_scan_partitions(bdev->bd_disk, mode);
        case BLKTRACESTART:
        case BLKTRACESTOP:
        case BLKTRACETEARDOWN: