summaryrefslogtreecommitdiffstats
path: root/include/scsi
diff options
context:
space:
mode:
authorMartin K. Petersen <martin.petersen@oracle.com>2019-10-09 21:54:04 -0400
committerMartin K. Petersen <martin.petersen@oracle.com>2019-10-09 21:54:04 -0400
commita3a8d13f625d9f20664515d61d4c9a9452119d21 (patch)
tree8d3bd45b741f10980c141cc35c06143a82e8ea18 /include/scsi
parent27f722ccbe1563629275bb7ee30c0e307f5837a2 (diff)
parentb23f330d5145b92f90cf16f1adc5444ad06764b4 (diff)
downloadlinux-a3a8d13f625d9f20664515d61d4c9a9452119d21.tar.gz
linux-a3a8d13f625d9f20664515d61d4c9a9452119d21.tar.bz2
linux-a3a8d13f625d9f20664515d61d4c9a9452119d21.zip
Merge branch '5.4/scsi-fixes' into 5.5/scsi-queue
The qla2xxx driver updates for 5.5 depend on the fixes queued for 5.4. Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'include/scsi')
-rw-r--r--include/scsi/scsi_eh.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/scsi/scsi_eh.h b/include/scsi/scsi_eh.h
index 3810b340551c..6bd5ed695a5e 100644
--- a/include/scsi/scsi_eh.h
+++ b/include/scsi/scsi_eh.h
@@ -32,6 +32,7 @@ extern int scsi_ioctl_reset(struct scsi_device *, int __user *);
struct scsi_eh_save {
/* saved state */
int result;
+ unsigned int resid_len;
int eh_eflags;
enum dma_data_direction data_direction;
unsigned underflow;