From e90f6a8e1c4fe607b3c11876025d5c8e70571986 Mon Sep 17 00:00:00 2001 From: Alan Stern Date: Mon, 21 Jul 2008 10:25:52 -0400 Subject: [PATCH] --- yaml --- r: 106591 b: refs/heads/master c: 12265709ac6e197f4d40d9ec1fd3af97b4196a35 h: refs/heads/master i: 106589: 176113b1a41d6ed328a7cf486a2f0dcb8472e0d1 106587: 8c98935dd7c06e645384946ddc5f01d9d447a54d 106583: 30045e66be0e5160d4076752c108b9e1ec2cab58 106575: f4a578a661abe4ad81cf5c594fa630356b1473ff 106559: 6072953793d5d91312e7eff3ecda54b82d597b6b v: v3 --- [refs] | 2 +- trunk/drivers/scsi/scsi_error.c | 2 ++ trunk/include/scsi/scsi_eh.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8c0157359da7..795f18dc1f9e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: af55ff675a8461da6a632320710b050af4366e0c +refs/heads/master: 12265709ac6e197f4d40d9ec1fd3af97b4196a35 diff --git a/trunk/drivers/scsi/scsi_error.c b/trunk/drivers/scsi/scsi_error.c index fc4b2d05f2e1..171b82d748cf 100644 --- a/trunk/drivers/scsi/scsi_error.c +++ b/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); diff --git a/trunk/include/scsi/scsi_eh.h b/trunk/include/scsi/scsi_eh.h index e5499ed0e376..06a8790893ef 100644 --- a/trunk/include/scsi/scsi_eh.h +++ b/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;