From: Christoph Hellwig Date: Mon, 26 Feb 2024 18:10:45 +0000 (-0500) Subject: nvme-loop: initialize max_hw_sectors earlier X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ba151dc24af4885557ab9c5d37ad7afd58090aef;p=users%2Fhch%2Fblock.git nvme-loop: initialize max_hw_sectors earlier Initialize max_hw_sectors a little earlier so that nvme_alloc_admin_tag_set can rely on it to set the initial queue limits. Signed-off-by: Christoph Hellwig --- diff --git a/drivers/nvme/target/loop.c b/drivers/nvme/target/loop.c index e589915ddef8..d8e33427a921 100644 --- a/drivers/nvme/target/loop.c +++ b/drivers/nvme/target/loop.c @@ -351,6 +351,8 @@ static int nvme_loop_configure_admin_queue(struct nvme_loop_ctrl *ctrl) if (error) return error; ctrl->ctrl.queue_count = 1; + ctrl->ctrl.max_hw_sectors = + (NVME_LOOP_MAX_SEGMENTS - 1) << PAGE_SECTORS_SHIFT; error = nvme_alloc_admin_tag_set(&ctrl->ctrl, &ctrl->admin_tag_set, &nvme_loop_admin_mq_ops, @@ -372,9 +374,6 @@ static int nvme_loop_configure_admin_queue(struct nvme_loop_ctrl *ctrl) if (error) goto out_cleanup_tagset; - ctrl->ctrl.max_hw_sectors = - (NVME_LOOP_MAX_SEGMENTS - 1) << PAGE_SECTORS_SHIFT; - nvme_unquiesce_admin_queue(&ctrl->ctrl); error = nvme_init_ctrl_finish(&ctrl->ctrl, false);