From: Hannes Reinecke <hare@suse.de>
Date: Thu, 9 Nov 2017 17:57:06 +0100
Subject: block: create 'slaves' and 'holders' entries for hidden gendisks
Patch-mainline: v4.15-rc1
Git-commit: 17eac0996341cfd28b4093554e662fd82aa1c237
References: FATE#323952, FATE#322506
When creating nvme multipath devices we should populate the 'slaves' and
'holders' directorys properly to aid userspace topology detection.
Signed-off-by: Hannes Reinecke <hare@suse.com>
[hch: split from a larger patch]
Reviewed-by: Keith Busch <keith.busch@intel.com>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Acked-by: Johannes Thumshirn <jthumshirn@suse.de>
---
block/genhd.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -577,14 +577,14 @@ static void register_disk(struct device
*/
pm_runtime_set_memalloc_noio(ddev, true);
+ disk->part0.holder_dir = kobject_create_and_add("holders", &ddev->kobj);
+ disk->slave_dir = kobject_create_and_add("slaves", &ddev->kobj);
+
if (disk->flags & GENHD_FL_HIDDEN) {
dev_set_uevent_suppress(ddev, 0);
return;
}
- disk->part0.holder_dir = kobject_create_and_add("holders", &ddev->kobj);
- disk->slave_dir = kobject_create_and_add("slaves", &ddev->kobj);
-
/* No minors to use for partitions */
if (!disk_part_scan_enabled(disk))
goto exit;
@@ -720,11 +720,11 @@ void del_gendisk(struct gendisk *disk)
WARN_ON(1);
}
- if (!(disk->flags & GENHD_FL_HIDDEN)) {
+ if (!(disk->flags & GENHD_FL_HIDDEN))
blk_unregister_region(disk_devt(disk), disk->minors);
- kobject_put(disk->part0.holder_dir);
- kobject_put(disk->slave_dir);
- }
+
+ kobject_put(disk->part0.holder_dir);
+ kobject_put(disk->slave_dir);
part_stat_set_all(&disk->part0, 0);
disk->part0.stamp = 0;