Commit d2c945f0 authored by Martin K. Petersen's avatar Martin K. Petersen

scsi: core: Make scsi_get_lba() return the LBA

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.comReviewed-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>
parent 87662a47
...@@ -225,6 +225,13 @@ static inline sector_t scsi_get_sector(struct scsi_cmnd *scmd) ...@@ -225,6 +225,13 @@ static inline sector_t scsi_get_sector(struct scsi_cmnd *scmd)
return blk_rq_pos(scmd->request); 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 * The operations below are hints that tell the controller driver how
* to handle I/Os with DIF or similar types of protection information. * to handle I/Os with DIF or similar types of protection information.
...@@ -287,11 +294,6 @@ static inline unsigned char scsi_get_prot_type(struct scsi_cmnd *scmd) ...@@ -287,11 +294,6 @@ static inline unsigned char scsi_get_prot_type(struct scsi_cmnd *scmd)
return scmd->prot_type; 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) static inline u32 scsi_prot_ref_tag(struct scsi_cmnd *scmd)
{ {
struct request *rq = blk_mq_rq_from_pdu(scmd); struct request *rq = blk_mq_rq_from_pdu(scmd);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment