This is a note to let you know that I've just added the patch titled
Revert "scsi: core: Make scsi_get_lba() return the LBA"
to the 5.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
revert-scsi-core-make-scsi_get_lba-return-the-lba.patch
and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 63a2916eb40a0521af3075c27feac30e5b1d6c0c Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Date: Thu, 11 Jan 2024 10:35:01 +0100
Subject: Revert "scsi: core: Make scsi_get_lba() return the LBA"
From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
This reverts commit d054858a9c9e4406099e61fe00c93516f9b4c169 which is
commit d2c945f01d233085fedc9e3cf7ec180eaa2b7a85 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: Bart Van Assche <bvanassche@xxxxxxx>
Cc: Benjamin Block <bblock@xxxxxxxxxxxxx>
Cc: Sasha Levin <sashal@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
include/scsi/scsi_cmnd.h | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
--- a/include/scsi/scsi_cmnd.h
+++ b/include/scsi/scsi_cmnd.h
@@ -229,13 +229,6 @@ static inline sector_t scsi_get_sector(s
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_pro
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);
Patches currently in stable-queue which might be from gregkh@xxxxxxxxxxxxxxxxxxx are
queue-5.10/revert-scsi-core-introduce-scsi_get_sector.patch
queue-5.10/scsi-core-always-send-batch-on-reset-or-error-handling-command.patch
queue-5.10/revert-scsi-core-use-a-structure-member-to-track-the-scsi-command-submitter.patch
queue-5.10/revert-scsi-core-always-send-batch-on-reset-or-error-handling-command.patch
queue-5.10/revert-scsi-core-add-scsi_prot_ref_tag-helper.patch
queue-5.10/revert-scsi-core-use-scsi_cmd_to_rq-instead-of-scsi_cmnd.request.patch
queue-5.10/revert-scsi-core-make-scsi_get_lba-return-the-lba.patch
