Merge branch 'for-chris' of git://repo.or.cz/linux-btrfs-devel into integration

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

diff --git a/block/ioctl.c b/block/ioctl.c
index 55544033746392b081d9b41e123cb008c5b249a9..ca939fc1030f29489f8a5f2c5a142c4e6a6f2264 100644 (file)
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@ -102,7 +102,7 @@ static int blkdev_reread_part(struct block_device *bdev)
        struct gendisk *disk = bdev->bd_disk;
        int res;
 
-       if (!disk_partitionable(disk) || bdev != bdev->bd_contains)
+       if (!disk_part_scan_enabled(disk) || bdev != bdev->bd_contains)
                return -EINVAL;
        if (!capable(CAP_SYS_ADMIN))
                return -EACCES;