| From 96b1f96dcab87756c0a1e7ba76bc5dc2add82b88 Mon Sep 17 00:00:00 2001 |
| From: Mike Christie <michaelc@cs.wisc.edu> |
| Date: Sat, 24 Apr 2010 16:21:19 -0500 |
| Subject: SCSI: libiscsi: regression: fix header digest errors |
| |
| From: Mike Christie <michaelc@cs.wisc.edu> |
| |
| commit 96b1f96dcab87756c0a1e7ba76bc5dc2add82b88 upstream. |
| |
| This fixes a regression introduced with this commit: |
| |
| commit d3305f3407fa3e9452079ec6cc8379067456e4aa |
| Author: Mike Christie <michaelc@cs.wisc.edu> |
| Date: Thu Aug 20 15:10:58 2009 -0500 |
| |
| [SCSI] libiscsi: don't increment cmdsn if cmd is not sent |
| |
| in 2.6.32. |
| |
| When I moved the hdr->cmdsn after init_task, I added |
| a bug when header digests are used. The problem is |
| that the LLD may calculate the header digest in init_task, |
| so if we then set the cmdsn after the init_task call we |
| change what the digest will be calculated by the target. |
| |
| Signed-off-by: Mike Christie <michaelc@cs.wisc.edu> |
| Signed-off-by: James Bottomley <James.Bottomley@suse.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/scsi/libiscsi.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/scsi/libiscsi.c |
| +++ b/drivers/scsi/libiscsi.c |
| @@ -470,12 +470,12 @@ static int iscsi_prep_scsi_cmd_pdu(struc |
| |
| WARN_ON(hdrlength >= 256); |
| hdr->hlength = hdrlength & 0xFF; |
| + hdr->cmdsn = task->cmdsn = cpu_to_be32(session->cmdsn); |
| |
| if (session->tt->init_task && session->tt->init_task(task)) |
| return -EIO; |
| |
| task->state = ISCSI_TASK_RUNNING; |
| - hdr->cmdsn = task->cmdsn = cpu_to_be32(session->cmdsn); |
| session->cmdsn++; |
| |
| conn->scsicmd_pdus_cnt++; |
