Commit 3aa55180 authored Nov 08, 2023 by Christoph Hellwig Committed by Li Nan Nov 07, 2023

block: call blk_integrity_add earlier in device_add_disk

mainline inclusion
from mainline-v5.15-rc1
commit bab53f6b
category: bugfix
bugzilla: 188733

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=bab53f6b617d9f530978d6e3693f88e586d81a8a



----------------------------------------

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>
conflict:
  block/genhd.c
Signed-off-by: Zhong Jinghua <zhongjinghua@huawei.com>
Signed-off-by: Li Nan <linan122@huawei.com>

parent 2f5b002b

block/genhd.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -849,6 +849,8 @@ static void __device_add_disk(struct device parent, struct gendisk disk,
		*/
		pm_runtime_set_memalloc_noio(ddev, true);

		blk_integrity_add(disk);

		disk->part0.holder_dir =
		kobject_create_and_add("holders", &ddev->kobj);
		disk->slave_dir = kobject_create_and_add("slaves", &ddev->kobj);
		@@ -872,7 +874,6 @@ static void __device_add_disk(struct device parent, struct gendisk disk,
		WARN_ON_ONCE(!blk_get_queue(disk->queue));

		disk_add_events(disk);
		blk_integrity_add(disk);

		/* Make sure the first partition scan will be proceed */
		if (get_capacity(disk) && disk_part_scan_enabled(disk))