Commit bab53f6b authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: call blk_integrity_add earlier in 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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Link: https://lore.kernel.org/r/20210818144542.19305-6-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 9d5ee676

block/genhd.c

+2 −1
Original line number Diff line number Diff line
@@ -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);