nvme-multipath: fix logic for non-optimized paths

Handle the special case where we have exactly one optimized path,
which we should keep using in this case.

Fixes: 75c10e732724 ("nvme-multipath: round-robin I/O policy")
Signed off-by: Martin Wilck <mwilck@suse.com>
Signed-off-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
index 900b35d47ec7baba95ac0c66c4a79a1f98ac09b2..93c70e1591de8fdb3dda5943ee7a849e1c395057 100644 (file)
--- a/drivers/nvme/host/multipath.c
+++ b/drivers/nvme/host/multipath.c
@@ -255,6 +255,12 @@ static struct nvme_ns *nvme_round_robin_path(struct nvme_ns_head *head,
                        fallback = ns;
        }
 
+       /* No optimized path found, re-check the current path */
+       if (!nvme_path_is_disabled(old) &&
+           old->ana_state == NVME_ANA_OPTIMIZED) {
+               found = old;
+               goto out;
+       }
        if (!fallback)
                return NULL;
        found = fallback;