Commit 379e0df5 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

nvme-loop: initialize sqsize later 



Defer initializing the sqsize field from the options until it has been
capped by MAXCMD.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
parent 6dfba1c0

drivers/nvme/target/loop.c

+1 −1
Original line number Diff line number Diff line
@@ -601,7 +601,6 @@ static struct nvme_ctrl *nvme_loop_create_ctrl(struct device *dev, 


	ret = -ENOMEM;



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

	ctrl->ctrl.kato = opts->kato;

	ctrl->port = nvme_loop_find_port(&ctrl->ctrl);
@@ -621,6 +620,7 @@ static struct nvme_ctrl *nvme_loop_create_ctrl(struct device *dev, 
			opts->queue_size, ctrl->ctrl.maxcmd);

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

	}

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



	if (opts->nr_io_queues) {

		ret = nvme_loop_create_io_queues(ctrl);