From: Benjamin Marzinski <bmarz...@redhat.com>
Revert "nvme: nvme_mpath_init remove multipath check"
Upstream Status: RHEL-only
This reverts commit 47fba9626ae0597d1a6169fb8ece0bdd612286c7.
Since RHEL no longer supports non-native NVMe multipathing, we no longer
need to carry this RHEL-only patch improving dm-multipath on NVMe
devices.
Signed-off-by: Benjamin Marzinski <bmarz...@redhat.com>
diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
index blahblah..blahblah 100644
--- a/drivers/nvme/host/multipath.c
+++ b/drivers/nvme/host/multipath.c
@@ -1045,7 +1045,8 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl,
struct nvme_id_ctrl *id)
int error = 0;
/* check if multipath is enabled and we have the capability */
- if (!ctrl->subsys || !(ctrl->subsys->cmic & NVME_CTRL_CMIC_ANA))
+ if (!multipath || !ctrl->subsys ||
+ !(ctrl->subsys->cmic & NVME_CTRL_CMIC_ANA))
return 0;
/* initialize this in the identify path to cover controller resets */
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3690
--
_______________________________________________
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
Fedora Code of Conduct:
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives:
https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
Do not reply to spam, report it:
https://pagure.io/fedora-infrastructure/new_issue
