Skip to content

Commit 67cbba1

Browse files
author
Ming Lei
committed
block: add helper add_disk_final()
JIRA: https://issues.redhat.com/browse/RHEL-106845 commit 5fad149 Author: Ming Lei <ming.lei@redhat.com> Date: Mon May 5 22:17:45 2025 +0800 block: add helper add_disk_final() Add helper add_disk_final() for scanning partitions, announcing disk and handling the last thing for adding disk. No functional change, and prepare for prevent adding disk from happening when updating nr_hw_queues. Signed-off-by: Ming Lei <ming.lei@redhat.com> Reviewed-by: Hannes Reinecke <hare@suse.de> Reviewed-by: Nilay Shroff <nilay@linux.ibm.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Link: https://lore.kernel.org/r/20250505141805.2751237-8-ming.lei@redhat.com Signed-off-by: Jens Axboe <axboe@kernel.dk> Signed-off-by: Ming Lei <ming.lei@redhat.com>
1 parent b295291 commit 67cbba1

File tree

1 file changed

+27
-19
lines changed

1 file changed

+27
-19
lines changed

block/genhd.c

Lines changed: 27 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,32 @@ int disk_scan_partitions(struct gendisk *disk, blk_mode_t mode)
389389
return ret;
390390
}
391391

392+
static void add_disk_final(struct gendisk *disk)
393+
{
394+
struct device *ddev = disk_to_dev(disk);
395+
396+
if (!(disk->flags & GENHD_FL_HIDDEN)) {
397+
/* Make sure the first partition scan will be proceed */
398+
if (get_capacity(disk) && disk_has_partscan(disk))
399+
set_bit(GD_NEED_PART_SCAN, &disk->state);
400+
401+
bdev_add(disk->part0, ddev->devt);
402+
if (get_capacity(disk))
403+
disk_scan_partitions(disk, BLK_OPEN_READ);
404+
405+
/*
406+
* Announce the disk and partitions after all partitions are
407+
* created. (for hidden disks uevents remain suppressed forever)
408+
*/
409+
dev_set_uevent_suppress(ddev, 0);
410+
disk_uevent(disk, KOBJ_ADD);
411+
}
412+
413+
blk_apply_bdi_limits(disk->bdi, &disk->queue->limits);
414+
disk_add_events(disk);
415+
set_bit(GD_ADDED, &disk->state);
416+
}
417+
392418
/**
393419
* add_disk_fwnode - add disk information to kernel list with fwnode
394420
* @parent: parent device for the disk
@@ -516,21 +542,6 @@ int __must_check add_disk_fwnode(struct device *parent, struct gendisk *disk,
516542
&disk->bdi->dev->kobj, "bdi");
517543
if (ret)
518544
goto out_unregister_bdi;
519-
520-
/* Make sure the first partition scan will be proceed */
521-
if (get_capacity(disk) && disk_has_partscan(disk))
522-
set_bit(GD_NEED_PART_SCAN, &disk->state);
523-
524-
bdev_add(disk->part0, ddev->devt);
525-
if (get_capacity(disk))
526-
disk_scan_partitions(disk, BLK_OPEN_READ);
527-
528-
/*
529-
* Announce the disk and partitions after all partitions are
530-
* created. (for hidden disks uevents remain suppressed forever)
531-
*/
532-
dev_set_uevent_suppress(ddev, 0);
533-
disk_uevent(disk, KOBJ_ADD);
534545
} else {
535546
/*
536547
* Even if the block_device for a hidden gendisk is not
@@ -539,10 +550,7 @@ int __must_check add_disk_fwnode(struct device *parent, struct gendisk *disk,
539550
*/
540551
disk->part0->bd_dev = MKDEV(disk->major, disk->first_minor);
541552
}
542-
543-
blk_apply_bdi_limits(disk->bdi, &disk->queue->limits);
544-
disk_add_events(disk);
545-
set_bit(GD_ADDED, &disk->state);
553+
add_disk_final(disk);
546554
return 0;
547555

548556
out_unregister_bdi:

0 commit comments

Comments
 (0)