Commit b8a38ea6 authored Jan 07, 2019 by Andrey Smirnov Committed by Christoph Hellwig Jan 09, 2019

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
check

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

below will always be a no-op.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Reviewed-by: Keith Busch <keith.busch@intel.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Christoph Hellwig <hch@lst.de>

parent 6299358d

drivers/nvme/host/core.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -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);
		else

Admin message