summaryrefslogtreecommitdiff
path: root/fs/block_dev.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2021-04-06 08:22:55 +0200
committerJens Axboe <axboe@kernel.dk>2021-04-08 10:24:36 -0600
commitd3c4a43d9291279c28b26757351a6ab72c110753 (patch)
tree191523e681fdff315c7e14029ace1a42ce1aaa5e /fs/block_dev.c
parent473338be3aaea117a7133720305f240eb7f68951 (diff)
block: refactor blk_drop_partitions
Move the busy check and disk-wide sync into the only caller, so that the remainder can be shared with del_gendisk. Also pass the gendisk instead of the bdev as that is all that is needed. Signed-off-by: Christoph Hellwig <hch@lst.de> Link: https://lore.kernel.org/r/20210406062303.811835-5-hch@lst.de Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs/block_dev.c')
-rw-r--r--fs/block_dev.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/block_dev.c b/fs/block_dev.c
index 92ed7d5df677..594a1bee9dd9 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -1243,9 +1243,11 @@ int bdev_disk_changed(struct block_device *bdev, bool invalidate)
clear_bit(GD_NEED_PART_SCAN, &bdev->bd_disk->state);
rescan:
- ret = blk_drop_partitions(bdev);
- if (ret)
- return ret;
+ if (bdev->bd_part_count)
+ return -EBUSY;
+ sync_blockdev(bdev);
+ invalidate_bdev(bdev);
+ blk_drop_partitions(disk);
/*
* Historically we only set the capacity to zero for devices that