From: Hannes Reinecke <hare@suse.de>
Date: Thu, 23 Jan 2020 12:44:33 +0000 (+0100)
Subject: rbd: set the 'device' link in sysfs
X-Git-Tag: v5.6-rc1~43^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3325322f773bae68b20d8fa0e9e8ebb005271db5;p=thirdparty%2Fkernel%2Flinux.git

rbd: set the 'device' link in sysfs

The rbd driver already provides additional information in sysfs
under /sys/bus/rbd, so we should set the 'device' link in the block
device to reference this information.

Signed-off-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
---

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 38dcb39051a7f..405b66e090402 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -7143,7 +7143,7 @@ static ssize_t do_rbd_add(struct bus_type *bus,
 	if (rc)
 		goto err_out_image_lock;
 
-	add_disk(rbd_dev->disk);
+	device_add_disk(&rbd_dev->dev, rbd_dev->disk, NULL);
 	/* see rbd_init_disk() */
 	blk_put_queue(rbd_dev->disk->queue);