Commit b8a38ea6 authored by Andrey Smirnov's avatar Andrey Smirnov Committed by Christoph Hellwig

nvme: don't initlialize ctrl->cntlid twice

ctrl->cntlid will already be initialized from id->cntlid for
non-NVME_F_FABRICS controllers few lines below. For NVME_F_FABRICS
controllers this field should already be initialized, otherwise the

	if (ctrl->cntlid != le16_to_cpu(id->cntlid))

below will always be a no-op.
Signed-off-by: default avatarAndrey Smirnov <>
Reviewed-by: default avatarKeith Busch <>
Reviewed-by: default avatarSagi Grimberg <>
Signed-off-by: default avatarChristoph Hellwig <>
parent 6299358d
......@@ -2502,7 +2502,6 @@ int nvme_init_identify(struct nvme_ctrl *ctrl)
ctrl->oaes = le32_to_cpu(id->oaes);
atomic_set(&ctrl->abort_limit, id->acl + 1);
ctrl->vwc = id->vwc;
ctrl->cntlid = le16_to_cpup(&id->cntlid);
if (id->mdts)
max_hw_sectors = 1 << (id->mdts + page_shift - 9);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment