[SCSI] fix up request buffer reference in various scsi drivers

Various scsi drivers use scsi_cmnd.buffer and scsi_cmnd.bufflen in their
queuecommand functions.  Those fields are internal storage for the
midlayer only and are used to restore the original payload after
request_buffer and request_bufflen have been overwritten for EH.  Using
the buffer and bufflen fields means they do very broken things in error
handling.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.c b/drivers/scsi/sym53c8xx_2/sym_glue.c
index 9c83b4d39a26..ee081320e1f1 100644
--- a/drivers/scsi/sym53c8xx_2/sym_glue.c
+++ b/drivers/scsi/sym53c8xx_2/sym_glue.c
@@ -156,7 +156,7 @@ static void __unmap_scsi_data(struct pci_dev *pdev, struct scsi_cmnd *cmd)
 
         switch(SYM_UCMD_PTR(cmd)->data_mapped) {
         case 2:
-                pci_unmap_sg(pdev, cmd->buffer, cmd->use_sg, dma_dir);
+                pci_unmap_sg(pdev, cmd->request_buffer, cmd->use_sg, dma_dir);
                 break;
         case 1:
                 pci_unmap_single(pdev, SYM_UCMD_PTR(cmd)->data_mapping,
@@ -186,7 +186,7 @@ static int __map_scsi_sg_data(struct pci_dev *pdev, struct scsi_cmnd *cmd)
         int use_sg;
         int dma_dir = cmd->sc_data_direction;
 
-        use_sg = pci_map_sg(pdev, cmd->buffer, cmd->use_sg, dma_dir);
+        use_sg = pci_map_sg(pdev, cmd->request_buffer, cmd->use_sg, dma_dir);
         if (use_sg > 0) {
                 SYM_UCMD_PTR(cmd)->data_mapped  = 2;
                 SYM_UCMD_PTR(cmd)->data_mapping = use_sg;
@@ -376,7 +376,7 @@ static int sym_scatter(struct sym_hcb *np, struct sym_ccb *cp, struct scsi_cmnd
         if (!use_sg)
                 segment = sym_scatter_no_sglist(np, cp, cmd);
         else if ((use_sg = map_scsi_sg_data(np, cmd)) > 0) {
-                struct scatterlist *scatter = (struct scatterlist *)cmd->buffer;
+                struct scatterlist *scatter = (struct scatterlist *)cmd->request_buffer;
                 struct sym_tcb *tp = &np->target[cp->target];
                 struct sym_tblmove *data;