nvme-multipath: also check for a disabled path if there is a single sibling

When we have a singular list in nvme_round_robin_path() we still
need to check its validity.

Signed-off-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
index 5a6dbb422a9c09c249673a3cf6272eba955807f9..9b6dc11fa55963038bd8aa444b344658b520366a 100644 (file)
--- a/drivers/nvme/host/multipath.c
+++ b/drivers/nvme/host/multipath.c
@@ -183,8 +183,11 @@ static struct nvme_ns *nvme_round_robin_path(struct nvme_ns_head *head,
 {
        struct nvme_ns *ns, *found, *fallback = NULL;
 
-       if (list_is_singular(&head->list))
+       if (list_is_singular(&head->list)) {
+               if (nvme_path_is_disabled(old))
+                       return NULL;
                return old;
+       }
 
        for (ns = nvme_next_ns(head, old);
             ns != old;