Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca7ae5c9 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Christoph Hellwig
Browse files

nvme-multipath: factor out a nvme_path_is_disabled helper 



Factor our a common helper to check if a path has been disabled
by something other than the per-namespace ANA state.

Signed-off-by: default avatarHannes Reinecke <hare@suse.com>
[hch: split from a bigger patch]
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 81adb863

drivers/nvme/host/multipath.c

+8 −4
Original line number Diff line number Diff line
@@ -123,14 +123,19 @@ void nvme_mpath_clear_current_path(struct nvme_ns *ns) 
	}

}



static bool nvme_path_is_disabled(struct nvme_ns *ns)

{

	return ns->ctrl->state != NVME_CTRL_LIVE ||

		test_bit(NVME_NS_ANA_PENDING, &ns->flags);

}



static struct nvme_ns *__nvme_find_path(struct nvme_ns_head *head, int node)

{

	int found_distance = INT_MAX, fallback_distance = INT_MAX, distance;

	struct nvme_ns *found = NULL, *fallback = NULL, *ns;



	list_for_each_entry_rcu(ns, &head->list, siblings) {

		if (ns->ctrl->state != NVME_CTRL_LIVE ||

		    test_bit(NVME_NS_ANA_PENDING, &ns->flags))

		if (nvme_path_is_disabled(ns))

			continue;



		if (READ_ONCE(head->subsys->iopolicy) == NVME_IOPOLICY_NUMA)
@@ -184,8 +189,7 @@ static struct nvme_ns *nvme_round_robin_path(struct nvme_ns_head *head, 
	for (ns = nvme_next_ns(head, old);

	     ns != old;

	     ns = nvme_next_ns(head, ns)) {

		if (ns->ctrl->state != NVME_CTRL_LIVE ||

		    test_bit(NVME_NS_ANA_PENDING, &ns->flags))

		if (nvme_path_is_disabled(ns))

			continue;



		if (ns->ana_state == NVME_ANA_OPTIMIZED) {