Commit 609e4dfc authored by Martin K. Petersen's avatar Martin K. Petersen Committed by Li Lingfeng
Browse files

scsi: core: Make scsi_get_lba() return the LBA 

stable inclusion
from stable-v5.10.206
commit d054858a9c9e4406099e61fe00c93516f9b4c169
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8ZD3X
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.206&id=d054858a9c9e4406099e61fe00c93516f9b4c169

-------------------------

[ Upstream commit d2c945f0 ]

scsi_get_lba() confusingly returned the block layer sector number expressed
in units of 512 bytes. Now that we have a more aptly named
scsi_get_sector() function, make scsi_get_lba() return the actual LBA.

Link: https://lore.kernel.org/r/20210609033929.3815-13-martin.petersen@oracle.com


Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Reviewed-by: default avatarBenjamin Block <bblock@linux.ibm.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Message-Id: <20210609033929.3815-13-martin.petersen@oracle.com>
Stable-dep-of: 066c5b46b6ea ("scsi: core: Always send batch on reset or error handling command")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarLi Lingfeng <lilingfeng3@huawei.com>
parent 5c03179e

include/scsi/scsi_cmnd.h

+7 −5
Original line number Diff line number Diff line
@@ -229,6 +229,13 @@ static inline sector_t scsi_get_sector(struct scsi_cmnd *scmd) 
	return blk_rq_pos(scmd->request);

}



static inline sector_t scsi_get_lba(struct scsi_cmnd *scmd)

{

	unsigned int shift = ilog2(scmd->device->sector_size) - SECTOR_SHIFT;



	return blk_rq_pos(scmd->request) >> shift;

}



/*

 * The operations below are hints that tell the controller driver how

 * to handle I/Os with DIF or similar types of protection information.
@@ -291,11 +298,6 @@ static inline unsigned char scsi_get_prot_type(struct scsi_cmnd *scmd) 
	return scmd->prot_type;

}



static inline sector_t scsi_get_lba(struct scsi_cmnd *scmd)

{

	return blk_rq_pos(scmd->request);

}



static inline u32 scsi_prot_ref_tag(struct scsi_cmnd *scmd)

{

	struct request *rq = blk_mq_rq_from_pdu(scmd);