author: Christoph Hellwig <hch@lst.de> 2021-04-06 08:22:54 +0200
committer: Jens Axboe <axboe@kernel.dk> 2021-04-08 10:24:36 -0600
commit: 473338be3aaea117a7133720305f240eb7f68951
parent: 45611837bb37e4544ca048e33d833483b06e3b03
Commit Summary:
Diffstat:
2 files changed, 4 insertions, 7 deletions
diff --git a/block/genhd.c b/block/genhd.c
index 9b121b1f7998..15f99da4543f 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -686,11 +686,8 @@ void del_gendisk(struct gendisk *disk)
/* invalidate stuff */
disk_part_iter_init(&piter, disk, DISK_PITER_INCL_EMPTY);
- while ((part = disk_part_iter_next(&piter))) {
- fsync_bdev(part);
- __invalidate_device(part, true);
+ while ((part = disk_part_iter_next(&piter)))
delete_partition(part);
- }
disk_part_iter_exit(&piter);
fsync_bdev(disk->part0);
diff --git a/block/partitions/core.c b/block/partitions/core.c
index 22a0dab17ed3..8c1735292940 100644
--- a/block/partitions/core.c
+++ b/block/partitions/core.c
@@ -287,6 +287,9 @@ struct device_type part_type = {
*/
void delete_partition(struct block_device *part)
{
+ fsync_bdev(part);
+ __invalidate_device(part, true);
+
xa_erase(&part->bd_disk->part_tbl, part->bd_partno);
kobject_put(part->bd_holder_dir);
device_del(&part->bd_device);
@@ -468,9 +471,6 @@ int bdev_del_partition(struct block_device *bdev, int partno)
if (part->bd_openers)
goto out_unlock;
- sync_blockdev(part);
- invalidate_bdev(part);
-
delete_partition(part);
ret = 0;
out_unlock: