nvme: fix regression upon hot device removal and insertion
Sagi Grimberg
maintainerPATCH 1/1 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 1b1031ca63b2 ("nvme: validate cntlid during controller initialisation")
Reported-by Jon Derrick <jonathan.derrick at intel.com>
Tested-by Jon Derrick <jonathan.derrick at intel.com>
Signed-off-by Sagi Grimberg <sagi at grimberg.me>
--- drivers/nvme/host/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/nvme/host/core.c +2 -2
@@ -2419,8 +2419,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) {
Signature · 1 line
2.17.1
PATCH 1/1 nvme: fix regression upon hot device removal and insertion
Thanks,
applied to nvme-5.3.