diff options
| -rw-r--r-- | block/partitions/core.c | 4 | ||||
| -rw-r--r-- | drivers/s390/block/dasd_genhd.c | 3 |
2 files changed, 1 insertions, 6 deletions
diff --git a/block/partitions/core.c b/block/partitions/core.c index 1a7558917c47..22a0dab17ed3 100644 --- a/block/partitions/core.c +++ b/block/partitions/core.c @@ -544,10 +544,6 @@ int blk_drop_partitions(struct block_device *bdev) return 0; } -#ifdef CONFIG_S390 -/* for historic reasons in the DASD driver */ -EXPORT_SYMBOL_GPL(blk_drop_partitions); -#endif static bool blk_add_partition(struct gendisk *disk, struct block_device *bdev, struct parsed_partitions *state, int p) diff --git a/drivers/s390/block/dasd_genhd.c b/drivers/s390/block/dasd_genhd.c index a9698fba9b76..8d6587ec73e2 100644 --- a/drivers/s390/block/dasd_genhd.c +++ b/drivers/s390/block/dasd_genhd.c @@ -146,12 +146,11 @@ void dasd_destroy_partitions(struct dasd_block *block) block->bdev = NULL; mutex_lock(&bdev->bd_mutex); - blk_drop_partitions(bdev); + bdev_disk_changed(bdev, true); mutex_unlock(&bdev->bd_mutex); /* Matching blkdev_put to the blkdev_get in dasd_scan_partitions. */ blkdev_put(bdev, FMODE_READ); - set_capacity(block->gdp, 0); } int dasd_gendisk_init(void) |