summaryrefslogtreecommitdiffstats
path: root/include/scsi
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2022-02-24 18:55:48 +0100
committerMartin K. Petersen <martin.petersen@oracle.com>2022-03-02 04:21:49 +0100
commit5b794f98074a8b7e8eb77dd43746062940b51160 (patch)
tree0d9fb15f5afe36a628a7770de661d5355ea50af2 /include/scsi
parentscsi: core: Remove the cmd field from struct scsi_request (diff)
downloadlinux-5b794f98074a8b7e8eb77dd43746062940b51160.tar.xz
linux-5b794f98074a8b7e8eb77dd43746062940b51160.zip
scsi: core: Remove the sense and sense_len fields from struct scsi_request
Just use the sense_buffer field in struct scsi_cmnd for the sense data and move the sense_len field over to struct scsi_cmnd. Link: https://lore.kernel.org/r/20220224175552.988286-5-hch@lst.de Reviewed-by: Bart Van Assche <bvanassche@acm.org> Reviewed-by: John Garry <john.garry@huawei.com> Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'include/scsi')
-rw-r--r--include/scsi/scsi_cmnd.h1
-rw-r--r--include/scsi/scsi_request.h2
2 files changed, 1 insertions, 2 deletions
diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h
index 3e432e25645a..47add5b32f46 100644
--- a/include/scsi/scsi_cmnd.h
+++ b/include/scsi/scsi_cmnd.h
@@ -112,6 +112,7 @@ struct scsi_cmnd {
reconnects. Probably == sector
size */
+ unsigned sense_len;
unsigned char *sense_buffer;
/* obtained by REQUEST SENSE when
* CHECK CONDITION is received on original
diff --git a/include/scsi/scsi_request.h b/include/scsi/scsi_request.h
index aeee0611bcbe..bed1cc49132a 100644
--- a/include/scsi/scsi_request.h
+++ b/include/scsi/scsi_request.h
@@ -6,10 +6,8 @@
struct scsi_request {
int result;
- unsigned int sense_len;
unsigned int resid_len; /* residual count */
int retries;
- void *sense;
};
static inline struct scsi_request *scsi_req(struct request *rq)