diff options
| author |   Christoph Hellwig <hch@lst.de> | 2021-11-22 14:06:16 +0100 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2021-11-29 06:35:21 -0700 |
| commit | e16e506ccd673a3a888a34f8f694698305840044 (patch) | |
| tree | ccf5b29c0132bf9a83e01ce253a311dffb42a15c /block/genhd.c | |
| parent | block: remove a dead check in show_partition (diff) | |
| download | linux-dev-e16e506ccd673a3a888a34f8f694698305840044.tar.xz linux-dev-e16e506ccd673a3a888a34f8f694698305840044.zip | |
block: merge disk_scan_partitions and blkdev_reread_part
Unify the functionality that implements a partition rescan for a
gendisk.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20211122130625.1136848-6-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/genhd.c')
| -rw-r--r-- | block/genhd.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/block/genhd.c b/block/genhd.c index 1c326d3b54b4..94f39c4333b8 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -372,17 +372,21 @@ void disk_uevent(struct gendisk *disk, enum kobject_action action) } EXPORT_SYMBOL_GPL(disk_uevent); -static void disk_scan_partitions(struct gendisk *disk) +int disk_scan_partitions(struct gendisk *disk, fmode_t mode) { struct block_device *bdev; - if (!get_capacity(disk) || !disk_part_scan_enabled(disk)) - return; + if (!disk_part_scan_enabled(disk)) + return -EINVAL; + if (disk->open_partitions) + return -EBUSY; set_bit(GD_NEED_PART_SCAN, &disk->state); - bdev = blkdev_get_by_dev(disk_devt(disk), FMODE_READ, NULL); - if (!IS_ERR(bdev)) - blkdev_put(bdev, FMODE_READ); + bdev = blkdev_get_by_dev(disk_devt(disk), mode, NULL); + if (IS_ERR(bdev)) + return PTR_ERR(bdev); + blkdev_put(bdev, mode); + return 0; } /** @@ -509,7 +513,8 @@ int __must_check device_add_disk(struct device *parent, struct gendisk *disk, goto out_unregister_bdi; bdev_add(disk->part0, ddev->devt); - disk_scan_partitions(disk); + if (get_capacity(disk)) + disk_scan_partitions(disk, FMODE_READ); /* * Announce the disk and partitions after all partitions are |