diff options
| author | Mike Christie <michaelc@cs.wisc.edu> | 2010-04-24 16:21:19 -0500 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2010-05-02 11:16:50 -0400 |
| commit | 96b1f96dcab87756c0a1e7ba76bc5dc2add82b88 (patch) | |
| tree | 9625a785d543663ba4a97e7fc452a9d77af9a86d | |
| parent | 70b25f890ce9f0520c64075ce9225a5b020a513e (diff) | |
| download | op-kernel-dev-96b1f96dcab87756c0a1e7ba76bc5dc2add82b88.zip op-kernel-dev-96b1f96dcab87756c0a1e7ba76bc5dc2add82b88.tar.gz | |
[SCSI] libiscsi: regression: fix header digest errors
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>
Cc: Stable Tree <stable@kernel.org>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
| -rw-r--r-- | drivers/scsi/libiscsi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c index 6d5ae44..633e090 100644 --- a/drivers/scsi/libiscsi.c +++ b/drivers/scsi/libiscsi.c @@ -471,12 +471,12 @@ static int iscsi_prep_scsi_cmd_pdu(struct iscsi_task *task) 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++; |
