From: Keith Busch Date: Mon, 29 Nov 2021 16:24:34 +0000 (-0800) Subject: nvme: show subsys nqn for duplicate cntlids X-Git-Tag: v5.16-rc5~11^2~3^2~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=16cc33b23732d3ec55e428ddadb39c225f23de7e;p=thirdparty%2Flinux.git nvme: show subsys nqn for duplicate cntlids The driver assigned nvme handle isn't persistent across reboots, so is not enough information to match up where the collisions are occuring. Add the subsys nqn string to the output so that it can more easily be identified later. Link: https://bugzilla.kernel.org/show_bug.cgi?id=215099 Signed-off-by: Keith Busch Signed-off-by: Christoph Hellwig --- diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 4c63564adeaa6..d476ad65def35 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -2696,8 +2696,9 @@ static bool nvme_validate_cntlid(struct nvme_subsystem *subsys, if (tmp->cntlid == ctrl->cntlid) { dev_err(ctrl->device, - "Duplicate cntlid %u with %s, rejecting\n", - ctrl->cntlid, dev_name(tmp->device)); + "Duplicate cntlid %u with %s, subsys %s, rejecting\n", + ctrl->cntlid, dev_name(tmp->device), + subsys->subnqn); return false; }