Merge tag 'v4.4-rc4'

[firefly-linux-kernel-4.4.55.git] / block / partition-generic.c

diff --git a/block/partition-generic.c b/block/partition-generic.c
index d12489ea720982257e188957a67757cd632cac20..ae95e963c5bb15df14a96b77a50c8a9302f23f53 100644 (file)
--- a/block/partition-generic.c
+++ b/block/partition-generic.c
@@ -408,7 +408,7 @@ static int drop_partitions(struct gendisk *disk, struct block_device *bdev)
        struct hd_struct *part;
        int res;
 
-       if (bdev->bd_part_count)
+       if (bdev->bd_part_count || bdev->bd_super)
                return -EBUSY;
        res = invalidate_partition(disk, 0);
        if (res)