| Message ID | 20210818144542.19305-6-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/11] block: add a sanity check for a live disk in del_gendisk | expand |
On 8/18/21 4:45 PM, Christoph Hellwig wrote: > Doing all the sysfs file creation before adding the bdev and thus > allowing it to be opened will simplify the about to be added error > handling. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > block/genhd.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > Reviewed-by: Hannes Reinecke <hare@suse.de> Cheers, Hannes
diff --git a/block/genhd.c b/block/genhd.c index f05e58f214d2..75d900e4c82f 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -492,6 +492,8 @@ void device_add_disk(struct device *parent, struct gendisk *disk, */ pm_runtime_set_memalloc_noio(ddev, true); + blk_integrity_add(disk); + disk->part0->bd_holder_dir = kobject_create_and_add("holders", &ddev->kobj); disk->slave_dir = kobject_create_and_add("slaves", &ddev->kobj); @@ -538,7 +540,6 @@ void device_add_disk(struct device *parent, struct gendisk *disk, blk_register_queue(disk); disk_add_events(disk); - blk_integrity_add(disk); } EXPORT_SYMBOL(device_add_disk);
Doing all the sysfs file creation before adding the bdev and thus allowing it to be opened will simplify the about to be added error handling. Signed-off-by: Christoph Hellwig <hch@lst.de> --- block/genhd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)