summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2021-08-18 16:45:36 +0200
committerJens Axboe <axboe@kernel.dk>2021-08-23 12:55:45 -0600
commitbab53f6b617d9f530978d6e3693f88e586d81a8a (patch)
treeab3c485848a2e6723bf33ca6e764010ebd0f521f
parent9d5ee6767c85762205b788ed1245f21fafd6c504 (diff)
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: Christoph Hellwig <hch@lst.de> Reviewed-by: Hannes Reinecke <hare@suse.de> Link: https://lore.kernel.org/r/20210818144542.19305-6-hch@lst.de Signed-off-by: Jens Axboe <axboe@kernel.dk>
-rw-r--r--block/genhd.c3
1 files changed, 2 insertions, 1 deletions
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);