Commit 18ecd975 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

nvme-fc: keep ctrl->sqsize in sync with opts->queue_size 



Also update the sqsize field when capping the queue size, and remove the
check a queue size that is larger than sqsize given that sqsize is only
initialized from opts->queue_size.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarJames Smart <jsmart2021@gmail.com>
parent cefa1032

drivers/nvme/host/fc.c

+1 −9
Original line number Diff line number Diff line
@@ -3165,15 +3165,7 @@ nvme_fc_create_association(struct nvme_fc_ctrl *ctrl) 
			"to maxcmd\n",

			opts->queue_size, ctrl->ctrl.maxcmd);

		opts->queue_size = ctrl->ctrl.maxcmd;

	}



	if (opts->queue_size > ctrl->ctrl.sqsize + 1) {

		/* warn if sqsize is lower than queue_size */

		dev_warn(ctrl->ctrl.device,

			"queue_size %zu > ctrl sqsize %u, reducing "

			"to sqsize\n",

			opts->queue_size, ctrl->ctrl.sqsize + 1);

		opts->queue_size = ctrl->ctrl.sqsize + 1;

		ctrl->ctrl.sqsize = opts->queue_size - 1;

	}



	ret = nvme_fc_init_aen_ops(ctrl);