This is a note to let you know that I've just added the patch titled Revert "scsi: core: Add scsi_prot_ref_tag() helper" 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-add-scsi_prot_ref_tag-helper.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 2c9c3d082244f177c9d41b8d8659e1892936d014 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> Date: Thu, 11 Jan 2024 10:35:04 +0100 Subject: Revert "scsi: core: Add scsi_prot_ref_tag() helper" From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> This reverts commit 294d66c35a4e019a9dfe889fe382adce1cc3773e which is commit 7ba46799d34695534666a3f71a2be10ea85ece6c 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 | 7 ------- 1 file changed, 7 deletions(-) --- a/include/scsi/scsi_cmnd.h +++ b/include/scsi/scsi_cmnd.h @@ -291,13 +291,6 @@ static inline sector_t scsi_get_lba(stru 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); - - return t10_pi_ref_tag(rq); -} - static inline unsigned int scsi_prot_interval(struct scsi_cmnd *scmd) { return scmd->device->sector_size; 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