Commit 4b3daaf0 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by openeuler-sync-bot
Browse files

Revert "scsi: core: Make scsi_get_lba() return the LBA" 

stable inclusion
from stable-v5.10.207
commit a5edb407029321066c0ebbc2fd3d91acdd644d1e
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.207&id=a5edb407029321066c0ebbc2fd3d91acdd644d1e

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

This reverts commit d054858a9c9e4406099e61fe00c93516f9b4c169 which is
commit d2c945f0 upstream.

As reported, a lot of scsi changes were made just to resolve a 2 line
patch, so let's revert them all and then manually fix up the 2 line
fixup so that things are simpler and potential abi changes are not an
issue.

Link: https://lore.kernel.org/r/ZZ042FejzwMM5vDW@duo.ucw.cz


Reported-by: default avatarPavel Machek <pavel@ucw.cz>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: Bart Van Assche <bvanassche@acm.org>
Cc: Benjamin Block <bblock@linux.ibm.com>
Cc: Sasha Levin <sashal@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarLi Lingfeng <lilingfeng3@huawei.com>
(cherry picked from commit 6e9aa8e6)
parent 3145b6aa

include/scsi/scsi_cmnd.h

+5 −7
Original line number Diff line number Diff line
@@ -229,13 +229,6 @@ 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.
@@ -298,6 +291,11 @@ 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);