From mboxrd@z Thu Jan 1 00:00:00 1970 From: Damien Le Moal Subject: [PATCH V3 2/2] scsi: sd: Use sectors_to_logical() Date: Tue, 5 Sep 2017 20:55:36 +0900 Message-ID: <20170905115536.2896-3-damien.lemoal@wdc.com> References: <20170905115536.2896-1-damien.lemoal@wdc.com> Return-path: Received: from esa6.hgst.iphmx.com ([216.71.154.45]:63329 "EHLO esa6.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750922AbdIEL5U (ORCPT ); Tue, 5 Sep 2017 07:57:20 -0400 In-Reply-To: <20170905115536.2896-1-damien.lemoal@wdc.com> Sender: linux-scsi-owner@vger.kernel.org List-Id: linux-scsi@vger.kernel.org To: linux-scsi@vger.kernel.org, "Martin K . Petersen" Cc: Jens Axboe , Christoph Hellwig , Bart Van Assche Replace open coded conversions. Signed-off-by: Damien Le Moal --- drivers/scsi/sd.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 0a824e9f4d63..c5d05b1c58a5 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -738,8 +738,8 @@ static int sd_setup_unmap_cmnd(struct scsi_cmnd *cmd) { struct scsi_device *sdp = cmd->device; struct request *rq = cmd->request; - u64 sector = blk_rq_pos(rq) >> (ilog2(sdp->sector_size) - 9); - u32 nr_sectors = blk_rq_sectors(rq) >> (ilog2(sdp->sector_size) - 9); + u64 sector = sectors_to_logical(sdp, blk_rq_pos(rq)); + u32 nr_sectors = sectors_to_logical(sdp, blk_rq_sectors(rq)); unsigned int data_len = 24; char *buf; @@ -772,8 +772,8 @@ static int sd_setup_write_same16_cmnd(struct scsi_cmnd *cmd, bool unmap) { struct scsi_device *sdp = cmd->device; struct request *rq = cmd->request; - u64 sector = blk_rq_pos(rq) >> (ilog2(sdp->sector_size) - 9); - u32 nr_sectors = blk_rq_sectors(rq) >> (ilog2(sdp->sector_size) - 9); + u64 sector = sectors_to_logical(sdp, blk_rq_pos(rq)); + u32 nr_sectors = sectors_to_logical(sdp, blk_rq_sectors(rq)); u32 data_len = sdp->sector_size; rq->special_vec.bv_page = alloc_page(GFP_ATOMIC | __GFP_ZERO); @@ -802,8 +802,8 @@ static int sd_setup_write_same10_cmnd(struct scsi_cmnd *cmd, bool unmap) { struct scsi_device *sdp = cmd->device; struct request *rq = cmd->request; - u64 sector = blk_rq_pos(rq) >> (ilog2(sdp->sector_size) - 9); - u32 nr_sectors = blk_rq_sectors(rq) >> (ilog2(sdp->sector_size) - 9); + u64 sector = sectors_to_logical(sdp, blk_rq_pos(rq)); + u32 nr_sectors = sectors_to_logical(sdp, blk_rq_sectors(rq)); u32 data_len = sdp->sector_size; rq->special_vec.bv_page = alloc_page(GFP_ATOMIC | __GFP_ZERO); @@ -833,8 +833,8 @@ static int sd_setup_write_zeroes_cmnd(struct scsi_cmnd *cmd) struct request *rq = cmd->request; struct scsi_device *sdp = cmd->device; struct scsi_disk *sdkp = scsi_disk(rq->rq_disk); - u64 sector = blk_rq_pos(rq) >> (ilog2(sdp->sector_size) - 9); - u32 nr_sectors = blk_rq_sectors(rq) >> (ilog2(sdp->sector_size) - 9); + u64 sector = sectors_to_logical(sdp, blk_rq_pos(rq)); + u32 nr_sectors = sectors_to_logical(sdp, blk_rq_sectors(rq)); int ret; if (!(rq->cmd_flags & REQ_NOUNMAP)) { -- 2.13.5