summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-01-11 10:35:02 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-01-12 20:56:38 +0100
commitf60f60e1deca9729c596b2bca9f1e1bf47bf8a0e (patch)
treeee99e7dc81675865e117721e497ee41bcf7043cb
parenta5edb407029321066c0ebbc2fd3d91acdd644d1e (diff)
Revert "scsi: core: Introduce scsi_get_sector()"
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@duo.ucw.cz Reported-by: Pavel Machek <pavel@ucw.cz> Cc: "Martin K. Petersen" <martin.petersen@oracle.com> Cc: Christoph Hellwig <hch@lst.de> Cc: Ming Lei <ming.lei@redhat.com> Cc: Hannes Reinecke <hare@suse.de> Cc: Damien Le Moal <damien.lemoal@wdc.com> Cc: Benjamin Block <bblock@linux.ibm.com> Cc: Bart Van Assche <bvanassche@acm.org> Cc: Sasha Levin <sashal@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--include/scsi/scsi_cmnd.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h
index ddab0c580382..663046463533 100644
--- a/include/scsi/scsi_cmnd.h
+++ b/include/scsi/scsi_cmnd.h
@@ -224,11 +224,6 @@ static inline int scsi_sg_copy_to_buffer(struct scsi_cmnd *cmd,
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.