Skip to contentSkip to conversation

nvme-multipath: relax ANA state check

PATCH New Hannes Reinecke 2 participants 2 messages Mar 27, 2019 NVMe

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 nvme-multipath: relax ANA state check

From: Martin George <[email protected]>

When undergoing state transitions I/O might be requeued, hence we should always call nvme_mpath_set_live() to schedule requeue_work whenever the nvme device is live, independent on whether the old state was live or not.

Signed-off-by Martin George <marting at netapp.com>
Signed-off-by Gargi Srinivas <sring at netapp.com>
Signed-off-by Hannes Reinecke <hare at suse.com>
---
 drivers/nvme/host/multipath.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/nvme/host/multipath.c +1 -4
index 2839bb70badf..f0716f6ce41f 100644
@@ -404,15 +404,12 @@ static inline bool nvme_state_is_live(enum nvme_ana_state state)
 static void nvme_update_ns_ana_state(struct nvme_ana_group_desc *desc,
 		struct nvme_ns *ns)
 {
-	enum nvme_ana_state old;
-
 	mutex_lock(&ns->head->lock);
-	old = ns->ana_state;
 	ns->ana_grpid = le32_to_cpu(desc->grpid);
 	ns->ana_state = desc->state;
 	clear_bit(NVME_NS_ANA_PENDING, &ns->flags);
 
-	if (nvme_state_is_live(ns->ana_state) && !nvme_state_is_live(old))
+	if (nvme_state_is_live(ns->ana_state))
 		nvme_mpath_set_live(ns);
 	mutex_unlock(&ns->head->lock);
 }
Signature · 1 line
2.16.4
maintainer Applied
#1 lore raw

PATCH v2 1/1 nvme-multipath: relax ANA state check

Thanks,

applied to nvme-5.1.