---

yaml
---
r: 106591
b: refs/heads/master
c: 1226570
h: refs/heads/master
i:
  106589: 176113b
  106587: 8c98935
  106583: 30045e6
  106575: f4a578a
  106559: 6072953
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af55ff675a8461da6a632320710b050af4366e0c
+refs/heads/master: 12265709ac6e197f4d40d9ec1fd3af97b4196a35

trunk/drivers/scsi/scsi_error.c

@@ -667,6 +667,7 @@ void scsi_eh_prep_cmnd(struct scsi_cmnd *scmd, struct scsi_eh_save *ses,
 	ses->sdb = scmd->sdb;
 	ses->next_rq = scmd->request->next_rq;
 	ses->result = scmd->result;
+	ses->underflow = scmd->underflow;
 	ses->prot_op = scmd->prot_op;
 
 	scmd->prot_op = SCSI_PROT_NORMAL;
@@ -727,6 +728,7 @@ void scsi_eh_restore_cmnd(struct scsi_cmnd* scmd, struct scsi_eh_save *ses)
 	scmd->sdb = ses->sdb;
 	scmd->request->next_rq = ses->next_rq;
 	scmd->result = ses->result;
+	scmd->underflow = ses->underflow;
 	scmd->prot_op = ses->prot_op;
 }
 EXPORT_SYMBOL(scsi_eh_restore_cmnd);

trunk/include/scsi/scsi_eh.h

@@ -74,6 +74,7 @@ struct scsi_eh_save {
 	/* saved state */
 	int result;
 	enum dma_data_direction data_direction;
+	unsigned underflow;
 	unsigned char cmd_len;
 	unsigned char prot_op;
 	unsigned char *cmnd;