bridge: Fix potential deadlock on br->multicast_lock

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

diff --git a/block/ioctl.c b/block/ioctl.c
index 1124cd297263571d63371ca8ed33f8c361b74e06..ca939fc1030f29489f8a5f2c5a142c4e6a6f2264 100644 (file)
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@ -1,5 +1,6 @@
 #include <linux/capability.h>
 #include <linux/blkdev.h>
+#include <linux/export.h>
 #include <linux/gfp.h>
 #include <linux/blkpg.h>
 #include <linux/hdreg.h>
@@ -101,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;