Commit 5d51dc8d authored by Keith Busch's avatar Keith Busch
Browse files

nvme-fc: set numa_node after nvme_init_ctrl 



nvme_init_ctrl() resets numa_node to NUMA_NO_NODE, so be sure to set the
desired value after that function call so it won't be overwritten.

Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarJens Axboe <axboe@kernel.dk>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMax Gurtovoy <mgurtovoy@nvidia.com>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
parent 7642138e

drivers/nvme/host/fc.c

+2 −4
Original line number Diff line number Diff line
@@ -3509,10 +3509,6 @@ nvme_fc_init_ctrl(struct device *dev, struct nvmf_ctrl_options *opts, 


	ctrl->ctrl.opts = opts;

	ctrl->ctrl.nr_reconnects = 0;

	if (lport->dev)

		ctrl->ctrl.numa_node = dev_to_node(lport->dev);

	else

		ctrl->ctrl.numa_node = NUMA_NO_NODE;

	INIT_LIST_HEAD(&ctrl->ctrl_list);

	ctrl->lport = lport;

	ctrl->rport = rport;
@@ -3557,6 +3553,8 @@ nvme_fc_init_ctrl(struct device *dev, struct nvmf_ctrl_options *opts, 
	ret = nvme_init_ctrl(&ctrl->ctrl, dev, &nvme_fc_ctrl_ops, 0);

	if (ret)

		goto out_free_queues;

	if (lport->dev)

		ctrl->ctrl.numa_node = dev_to_node(lport->dev);



	/* at this point, teardown path changes to ref counting on nvme ctrl */