nvme-multipath: system fails to create generic nvme device

[ Upstream commit 63bcf9014e95a7d279d10d8e2caa5d88db2b1855 ]

NVME_NSHEAD_DISK_LIVE is a flag for struct nvme_ns_head, not nvme_ns.
The current code has a typo causing NVME_NSHEAD_DISK_LIVE never to
be cleared once device_add_disk_fails, causing the system never to
create the 'generic' character device. Even several rescan attempts
will change the situation and the system has to be rebooted to fix
the issue.

Fixes: 11384580e332 ("nvme-multipath: add error handling support for add_disk()")
Signed-off-by: Hannes Reinecke <hare@kernel.org>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Keith Busch <kbusch@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
index 03a6868f4dbc18ab101dceaef6d3f325faeda660..a47d35102b7ce7a38586a216669ae5e28f6bcdbc 100644 (file)
--- a/drivers/nvme/host/multipath.c
+++ b/drivers/nvme/host/multipath.c
@@ -587,7 +587,7 @@ static void nvme_mpath_set_live(struct nvme_ns *ns)
                rc = device_add_disk(&head->subsys->dev, head->disk,
                                     nvme_ns_attr_groups);
                if (rc) {
-                       clear_bit(NVME_NSHEAD_DISK_LIVE, &ns->flags);
+                       clear_bit(NVME_NSHEAD_DISK_LIVE, &head->flags);
                        return;
                }
                nvme_add_ns_head_cdev(head);