nvmet: use PAGE_SECTORS_SHIFT
Subsystems (2)
PATCH 1/1 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 Damien Le Moal <[email protected]>
--- drivers/nvme/target/loop.c | 2 +- drivers/nvme/target/passthru.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/nvme/target/loop.c +1 -1
@@ -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
@@ -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 ;
Signature · 1 line
2.41.0
Looks good:
Reviewed-by Christoph Hellwig <[email protected]>
Reviewed-by Sagi Grimberg <[email protected]>
Quoted 5 lines · Damien Le Moal
Replace occurences of the pattern "
PAGE_SHIFT- 9" in the passthru and loop targets withPAGE_SECTORS_SHIFT.Signed-off-by Damien Le Moal <[email protected]>---
Reviewed-by Chaitanya Kulkarni <[email protected]>
-ck
Applied, thanks!