5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> This reverts commit f230e6d4249b9ccdcb571077023cecabf91ecbb1 which is commit f0f214fe8cd32224267ebea93817b8c32074623d 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@xxxxxxxxxx Reported-by: Pavel Machek <pavel@xxxxxx> Cc: "Martin K. Petersen" <martin.petersen@xxxxxxxxxx> Cc: Christoph Hellwig <hch@xxxxxx> Cc: Ming Lei <ming.lei@xxxxxxxxxx> Cc: Hannes Reinecke <hare@xxxxxxx> Cc: Damien Le Moal <damien.lemoal@xxxxxxx> Cc: Benjamin Block <bblock@xxxxxxxxxxxxx> Cc: Bart Van Assche <bvanassche@xxxxxxx> Cc: Sasha Levin <sashal@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- include/scsi/scsi_cmnd.h | 5 ----- 1 file changed, 5 deletions(-) --- a/include/scsi/scsi_cmnd.h +++ b/include/scsi/scsi_cmnd.h @@ -224,11 +224,6 @@ static inline int scsi_sg_copy_to_buffer buf, buflen); } -static inline sector_t scsi_get_sector(struct scsi_cmnd *scmd) -{ - return blk_rq_pos(scmd->request); -} - /* * The operations below are hints that tell the controller driver how * to handle I/Os with DIF or similar types of protection information.
