aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBoaz Harrosh <bharrosh@panasas.com>2007-09-09 14:16:58 -0400
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2008-01-11 19:22:41 -0500
commit57643c711c3759623e7ac651a4a418858cdaeae5 (patch)
tree8ffd1a1b8df766a1081228b8e0e2b901c5e30273
parent74286a3c276bca449f934b2cd921f9bced996e04 (diff)
[SCSI] ppa: convert to accessors and !use_sg cleanup
- convert to accessors and !use_sg cleanup Signed-off-by: Boaz Harrosh <bharrosh@panasas.com> Acked-by: Randy Dunlap <randy.dunlap@oracle.com> Tested-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
-rw-r--r--drivers/scsi/ppa.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/scsi/ppa.c b/drivers/scsi/ppa.c
index 67ee51a3d7e1..f655ae320b48 100644
--- a/drivers/scsi/ppa.c
+++ b/drivers/scsi/ppa.c
@@ -750,18 +750,16 @@ static int ppa_engine(ppa_struct *dev, struct scsi_cmnd *cmd)
750 cmd->SCp.phase++; 750 cmd->SCp.phase++;
751 751
752 case 4: /* Phase 4 - Setup scatter/gather buffers */ 752 case 4: /* Phase 4 - Setup scatter/gather buffers */
753 if (cmd->use_sg) { 753 if (scsi_bufflen(cmd)) {
754 /* if many buffers are available, start filling the first */ 754 cmd->SCp.buffer = scsi_sglist(cmd);
755 cmd->SCp.buffer = (struct scatterlist *) cmd->request_buffer;
756 cmd->SCp.this_residual = cmd->SCp.buffer->length; 755 cmd->SCp.this_residual = cmd->SCp.buffer->length;
757 cmd->SCp.ptr = sg_virt(cmd->SCp.buffer); 756 cmd->SCp.ptr = sg_virt(cmd->SCp.buffer);
758 } else { 757 } else {
759 /* else fill the only available buffer */
760 cmd->SCp.buffer = NULL; 758 cmd->SCp.buffer = NULL;
761 cmd->SCp.this_residual = cmd->request_bufflen; 759 cmd->SCp.this_residual = 0;
762 cmd->SCp.ptr = cmd->request_buffer; 760 cmd->SCp.ptr = NULL;
763 } 761 }
764 cmd->SCp.buffers_residual = cmd->use_sg - 1; 762 cmd->SCp.buffers_residual = scsi_sg_count(cmd) - 1;
765 cmd->SCp.phase++; 763 cmd->SCp.phase++;
766 764
767 case 5: /* Phase 5 - Data transfer stage */ 765 case 5: /* Phase 5 - Data transfer stage */