[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/block/cciss_scsi.c b/drivers/block/cciss_scsi.c
index 597c007fe81b..afdff32f6724 100644
--- a/drivers/block/cciss_scsi.c
+++ b/drivers/block/cciss_scsi.c
@@ -578,7 +578,7 @@ complete_scsi_command( CommandList_struct *cp, int timeout, __u32 tag)
 
         if (cmd->use_sg) {
                 pci_unmap_sg(ctlr->pdev,
-                        cmd->buffer, cmd->use_sg,
+                        cmd->request_buffer, cmd->use_sg,
                                 cmd->sc_data_direction); 
         }
         else if (cmd->request_bufflen) {
@@ -1210,7 +1210,7 @@ cciss_scatter_gather(struct pci_dev *pdev,
                 struct scsi_cmnd *cmd)
 {
         unsigned int use_sg, nsegs=0, len;
-        struct scatterlist *scatter = (struct scatterlist *) cmd->buffer;
+        struct scatterlist *scatter = (struct scatterlist *) cmd->request_buffer;
         __u64 addr64;
 
         /* is it just one virtual address? */   
@@ -1232,7 +1232,7 @@ cciss_scatter_gather(struct pci_dev *pdev,
         } /* else, must be a list of virtual addresses.... */
         else if (cmd->use_sg <= MAXSGENTRIES) { /* not too many addrs? */
 
-                use_sg = pci_map_sg(pdev, cmd->buffer, cmd->use_sg, 
+                use_sg = pci_map_sg(pdev, cmd->request_buffer, cmd->use_sg,
                         cmd->sc_data_direction);
 
                 for (nsegs=0; nsegs < use_sg; nsegs++) {