Commit 9bcf156f authored by Damien Le Moal's avatar Damien Le Moal Committed by Keith Busch
Browse files

nvmet: use PAGE_SECTORS_SHIFT 



Replace occurences of the pattern "PAGE_SHIFT - 9" in the passthru and
loop targets with PAGE_SECTORS_SHIFT.

Signed-off-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
parent e5bb0988

drivers/nvme/target/loop.c

+1 −1
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ static int nvme_loop_configure_admin_queue(struct nvme_loop_ctrl *ctrl) 
		goto out_cleanup_tagset;



	ctrl->ctrl.max_hw_sectors =

		(NVME_LOOP_MAX_SEGMENTS - 1) << (PAGE_SHIFT - 9);

		(NVME_LOOP_MAX_SEGMENTS - 1) << PAGE_SECTORS_SHIFT;



	nvme_unquiesce_admin_queue(&ctrl->ctrl);

drivers/nvme/target/passthru.c

+2 −2
Original line number Diff line number Diff line
@@ -102,14 +102,14 @@ static u16 nvmet_passthru_override_id_ctrl(struct nvmet_req *req) 
	 * which depends on the host's memory fragementation. To solve this,

	 * ensure mdts is limited to the pages equal to the number of segments.

	 */

	max_hw_sectors = min_not_zero(pctrl->max_segments << (PAGE_SHIFT - 9),

	max_hw_sectors = min_not_zero(pctrl->max_segments << PAGE_SECTORS_SHIFT,

				      pctrl->max_hw_sectors);



	/*

	 * nvmet_passthru_map_sg is limitted to using a single bio so limit

	 * the mdts based on BIO_MAX_VECS as well

	 */

	max_hw_sectors = min_not_zero(BIO_MAX_VECS << (PAGE_SHIFT - 9),

	max_hw_sectors = min_not_zero(BIO_MAX_VECS << PAGE_SECTORS_SHIFT,

				      max_hw_sectors);



	page_shift = NVME_CAP_MPSMIN(ctrl->cap) + 12;