Skip to content

Commit 16cc33b

Browse files
keithbuschChristoph Hellwig
authored andcommitted
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 <[email protected]> Signed-off-by: Christoph Hellwig <[email protected]>
1 parent e3f9387 commit 16cc33b

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

drivers/nvme/host/core.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2696,8 +2696,9 @@ static bool nvme_validate_cntlid(struct nvme_subsystem *subsys,
26962696

26972697
if (tmp->cntlid == ctrl->cntlid) {
26982698
dev_err(ctrl->device,
2699-
"Duplicate cntlid %u with %s, rejecting\n",
2700-
ctrl->cntlid, dev_name(tmp->device));
2699+
"Duplicate cntlid %u with %s, subsys %s, rejecting\n",
2700+
ctrl->cntlid, dev_name(tmp->device),
2701+
subsys->subnqn);
27012702
return false;
27022703
}
27032704

0 commit comments

Comments
 (0)