Commit 420dc733 authored Jul 10, 2019 by Sagi Grimberg Committed by Christoph Hellwig Jul 10, 2019

nvme: fix regression upon hot device removal and insertion



When we validate the new controller id, we want to skip
controllers that are either deleting or dead. Fix the check
to do that and not on the newly added controller.

Fixes: 1b1031ca ("nvme: validate cntlid during controller initialisation")
Reported-by: Jon Derrick <jonathan.derrick@intel.com>
Tested-by: Jon Derrick <jonathan.derrick@intel.com>
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Christoph Hellwig <hch@lst.de>

parent 4c73cbdf

drivers/nvme/host/core.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2416,8 +2416,8 @@ static bool nvme_validate_cntlid(struct nvme_subsystem *subsys,
		lockdep_assert_held(&nvme_subsystems_lock);

		list_for_each_entry(tmp, &subsys->ctrls, subsys_entry) {
		if (ctrl->state == NVME_CTRL_DELETING \|\|
		ctrl->state == NVME_CTRL_DEAD)
		if (tmp->state == NVME_CTRL_DELETING \|\|
		tmp->state == NVME_CTRL_DEAD)
		continue;

		if (tmp->cntlid == ctrl->cntlid) {

Admin message