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

Commit 60d3b51d authored by Martin George's avatar Martin George Committed by Greg Kroah-Hartman
Browse files

nvme-multipath: relax ANA state check 



[ Upstream commit cc2278c413c3a06a93c23ee8722e4dd3d621de12 ]

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: default avatarMartin George <marting@netapp.com>
Signed-off-by: default avatarGargi Srinivas <sring@netapp.com>
Signed-off-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarSasha Levin (Microsoft) <sashal@kernel.org>
parent a918af5b

drivers/nvme/host/multipath.c

+1 −4
Original line number Diff line number Diff line
@@ -349,15 +349,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);

}