Merge tag 'iommu-fixes-v5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --git a/block/ioctl.c b/block/ioctl.c
index d61d652..ff241e6 100644 (file)
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@ -81,20 +81,27 @@ static int compat_blkpg_ioctl(struct block_device *bdev,
 }
 #endif
 
-static int blkdev_reread_part(struct block_device *bdev)
+static int blkdev_reread_part(struct block_device *bdev, fmode_t mode)
 {
-       int ret;
+       struct block_device *tmp;
 
        if (!disk_part_scan_enabled(bdev->bd_disk) || bdev_is_partition(bdev))
                return -EINVAL;
        if (!capable(CAP_SYS_ADMIN))
                return -EACCES;
 
-       mutex_lock(&bdev->bd_mutex);
-       ret = bdev_disk_changed(bdev, false);
-       mutex_unlock(&bdev->bd_mutex);
+       /*
+        * Reopen the device to revalidate the driver state and force a
+        * partition rescan.
+        */
+       mode &= ~FMODE_EXCL;
+       set_bit(GD_NEED_PART_SCAN, &bdev->bd_disk->state);
 
-       return ret;
+       tmp = blkdev_get_by_dev(bdev->bd_dev, mode, NULL);
+       if (IS_ERR(tmp))
+               return PTR_ERR(tmp);
+       blkdev_put(tmp, mode);
+       return 0;
 }
 
 static int blk_ioctl_discard(struct block_device *bdev, fmode_t mode,
@@ -498,7 +505,7 @@ static int blkdev_common_ioctl(struct block_device *bdev, fmode_t mode,
                bdev->bd_bdi->ra_pages = (arg * 512) / PAGE_SIZE;
                return 0;
        case BLKRRPART:
-               return blkdev_reread_part(bdev);
+               return blkdev_reread_part(bdev, mode);
        case BLKTRACESTART:
        case BLKTRACESTOP:
        case BLKTRACETEARDOWN: