Commit f03e94f2 authored by Chaotian Jing's avatar Chaotian Jing Committed by Martin K. Petersen
Browse files

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: 6a20e21a ("scsi: core: Add helper to return number of logical blocks in a request")
Signed-off-by: default avatarChaotian Jing <chaotian.jing@mediatek.com>
Link: https://lore.kernel.org/r/20240813053534.7720-1-chaotian.jing@mediatek.com


Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 2fa62ce9

include/scsi/scsi_cmnd.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

}