summaryrefslogtreecommitdiffstats
path: root/include/scsi
diff options
context:
space:
mode:
authorChaotian Jing <chaotian.jing@mediatek.com>2024-08-13 13:34:10 +0800
committerMartin K. Petersen <martin.petersen@oracle.com>2024-08-16 21:02:06 -0400
commitf03e94f23b04c2b71c0044c1534921b3975ef10c (patch)
treec61e7fa56be6def923cb6efdcab955f08b59a94f /include/scsi
parent2fa62ce91a52e704716d08f9a8eb3f9e7e04710d (diff)
downloadlinux-f03e94f23b04c2b71c0044c1534921b3975ef10c.tar.gz
linux-f03e94f23b04c2b71c0044c1534921b3975ef10c.tar.bz2
linux-f03e94f23b04c2b71c0044c1534921b3975ef10c.zip
scsi: core: Fix the return value of scsi_logical_block_count()
scsi_logical_block_count() should return the block count of a given SCSI command. The original implementation ended up shifting twice, leading to an incorrect count being returned. Fix the conversion between bytes and logical blocks. Cc: stable@vger.kernel.org Fixes: 6a20e21ae1e2 ("scsi: core: Add helper to return number of logical blocks in a request") Signed-off-by: Chaotian Jing <chaotian.jing@mediatek.com> Link: https://lore.kernel.org/r/20240813053534.7720-1-chaotian.jing@mediatek.com Reviewed-by: Bart Van Assche <bvanassche@acm.org> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'include/scsi')
-rw-r--r--include/scsi/scsi_cmnd.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h
index 45c40d200154..8ecfb94049db 100644
--- a/include/scsi/scsi_cmnd.h
+++ b/include/scsi/scsi_cmnd.h
@@ -234,7 +234,7 @@ static inline sector_t scsi_get_lba(struct scsi_cmnd *scmd)
static inline unsigned int scsi_logical_block_count(struct scsi_cmnd *scmd)
{
- unsigned int shift = ilog2(scmd->device->sector_size) - SECTOR_SHIFT;
+ unsigned int shift = ilog2(scmd->device->sector_size);
return blk_rq_bytes(scsi_cmd_to_rq(scmd)) >> shift;
}