1 files changed, 92 insertions, 70 deletions

diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 8a525abda30..d29f8464b74 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -37,6 +37,7 @@
 
 #include "scsi_priv.h"
 #include "scsi_logging.h"
+#include "scsi_transport_api.h"
 
 #define SENSE_TIMEOUT           (10*HZ)
 
@@ -589,39 +590,23 @@ static void scsi_abort_eh_cmnd(struct scsi_cmnd *scmd)
 }
 
 /**
- * scsi_send_eh_cmnd  - submit a scsi command as part of error recory
+ * scsi_eh_prep_cmnd  - Save a scsi command info as part of error recory
  * @scmd:       SCSI command structure to hijack
- * @cmnd:       CDB to send
+ * @ses:        structure to save restore information
+ * @cmnd:       CDB to send. Can be NULL if no new cmnd is needed
  * @cmnd_size:  size in bytes of @cmnd
- * @timeout:    timeout for this request
- * @copy_sense: request sense data if set to 1
- *
- * This function is used to send a scsi command down to a target device
- * as part of the error recovery process.  If @copy_sense is 0 the command
- * sent must be one that does not transfer any data.  If @copy_sense is 1
- * the command must be REQUEST_SENSE and this functions copies out the
- * sense buffer it got into @scmd->sense_buffer.
+ * @sense_bytes: size of sense data to copy. or 0 (if != 0 @cmnd is ignored)
  *
- * Return value:
- *    SUCCESS or FAILED or NEEDS_RETRY
+ * This function is used to save a scsi command information before re-execution
+ * as part of the error recovery process.  If @sense_bytes is 0 the command
+ * sent must be one that does not transfer any data.  If @sense_bytes != 0
+ * @cmnd is ignored and this functions sets up a REQUEST_SENSE command
+ * and cmnd buffers to read @sense_bytes into @scmd->sense_buffer.
  **/
-static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, unsigned char *cmnd,
-                             int cmnd_size, int timeout, int copy_sense)
+void scsi_eh_prep_cmnd(struct scsi_cmnd *scmd, struct scsi_eh_save *ses,
+                        unsigned char *cmnd, int cmnd_size, unsigned sense_bytes)
 {
         struct scsi_device *sdev = scmd->device;
-        struct Scsi_Host *shost = sdev->host;
-        int old_result = scmd->result;
-        DECLARE_COMPLETION_ONSTACK(done);
-        unsigned long timeleft;
-        unsigned long flags;
-        struct scatterlist sgl;
-        unsigned char old_cmnd[MAX_COMMAND_SIZE];
-        enum dma_data_direction old_data_direction;
-        unsigned short old_use_sg;
-        unsigned char old_cmd_len;
-        unsigned old_bufflen;
-        void *old_buffer;
-        int rtn;
 
         /*
          * We need saved copies of a number of fields - this is because
@@ -630,35 +615,42 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, unsigned char *cmnd,
          * we will need to restore these values prior to running the actual
          * command.
          */
-        old_buffer = scmd->request_buffer;
-        old_bufflen = scmd->request_bufflen;
-        memcpy(old_cmnd, scmd->cmnd, sizeof(scmd->cmnd));
-        old_data_direction = scmd->sc_data_direction;
-        old_cmd_len = scmd->cmd_len;
-        old_use_sg = scmd->use_sg;
-
-        memset(scmd->cmnd, 0, sizeof(scmd->cmnd));
-        memcpy(scmd->cmnd, cmnd, cmnd_size);
-
-        if (copy_sense) {
-                sg_init_one(&sgl, scmd->sense_buffer,
-                            sizeof(scmd->sense_buffer));
-
+        ses->cmd_len = scmd->cmd_len;
+        memcpy(ses->cmnd, scmd->cmnd, sizeof(scmd->cmnd));
+        ses->data_direction = scmd->sc_data_direction;
+        ses->bufflen = scmd->request_bufflen;
+        ses->buffer = scmd->request_buffer;
+        ses->use_sg = scmd->use_sg;
+        ses->resid = scmd->resid;
+        ses->result = scmd->result;
+
+        if (sense_bytes) {
+                scmd->request_bufflen = min_t(unsigned,
+                                       sizeof(scmd->sense_buffer), sense_bytes);
+                sg_init_one(&ses->sense_sgl, scmd->sense_buffer,
+                                                       scmd->request_bufflen);
+                scmd->request_buffer = &ses->sense_sgl;
                 scmd->sc_data_direction = DMA_FROM_DEVICE;
-                scmd->request_bufflen = sgl.length;
-                scmd->request_buffer = &sgl;
                 scmd->use_sg = 1;
+                memset(scmd->cmnd, 0, sizeof(scmd->cmnd));
+                scmd->cmnd[0] = REQUEST_SENSE;
+                scmd->cmnd[4] = scmd->request_bufflen;
+                scmd->cmd_len = COMMAND_SIZE(scmd->cmnd[0]);
         } else {
                 scmd->request_buffer = NULL;
                 scmd->request_bufflen = 0;
                 scmd->sc_data_direction = DMA_NONE;
                 scmd->use_sg = 0;
+                if (cmnd) {
+                        memset(scmd->cmnd, 0, sizeof(scmd->cmnd));
+                        memcpy(scmd->cmnd, cmnd, cmnd_size);
+                        scmd->cmd_len = COMMAND_SIZE(scmd->cmnd[0]);
+                }
         }
 
         scmd->underflow = 0;
-        scmd->cmd_len = COMMAND_SIZE(scmd->cmnd[0]);
 
-        if (sdev->scsi_level <= SCSI_2)
+        if (sdev->scsi_level <= SCSI_2 && sdev->scsi_level != SCSI_UNKNOWN)
                 scmd->cmnd[1] = (scmd->cmnd[1] & 0x1f) |
                         (sdev->lun << 5 & 0xe0);
 
@@ -667,7 +659,58 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, unsigned char *cmnd,
          * untransferred sense data should be interpreted as being zero.
          */
         memset(scmd->sense_buffer, 0, sizeof(scmd->sense_buffer));
+}
+EXPORT_SYMBOL(scsi_eh_prep_cmnd);
+
+/**
+ * scsi_eh_restore_cmnd  - Restore a scsi command info as part of error recory
+ * @scmd:       SCSI command structure to restore
+ * @ses:        saved information from a coresponding call to scsi_prep_eh_cmnd
+ *
+ * Undo any damage done by above scsi_prep_eh_cmnd().
+ **/
+void scsi_eh_restore_cmnd(struct scsi_cmnd* scmd, struct scsi_eh_save *ses)
+{
+        /*
+         * Restore original data
+         */
+        scmd->cmd_len = ses->cmd_len;
+        memcpy(scmd->cmnd, ses->cmnd, sizeof(scmd->cmnd));
+        scmd->sc_data_direction = ses->data_direction;
+        scmd->request_bufflen = ses->bufflen;
+        scmd->request_buffer = ses->buffer;
+        scmd->use_sg = ses->use_sg;
+        scmd->resid = ses->resid;
+        scmd->result = ses->result;
+}
+EXPORT_SYMBOL(scsi_eh_restore_cmnd);
 
+/**
+ * scsi_send_eh_cmnd  - submit a scsi command as part of error recory
+ * @scmd:       SCSI command structure to hijack
+ * @cmnd:       CDB to send
+ * @cmnd_size:  size in bytes of @cmnd
+ * @timeout:    timeout for this request
+ * @sense_bytes: size of sense data to copy or 0
+ *
+ * This function is used to send a scsi command down to a target device
+ * as part of the error recovery process. See also scsi_eh_prep_cmnd() above.
+ *
+ * Return value:
+ *    SUCCESS or FAILED or NEEDS_RETRY
+ **/
+static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, unsigned char *cmnd,
+                             int cmnd_size, int timeout, unsigned sense_bytes)
+{
+        struct scsi_device *sdev = scmd->device;
+        struct Scsi_Host *shost = sdev->host;
+        DECLARE_COMPLETION_ONSTACK(done);
+        unsigned long timeleft;
+        unsigned long flags;
+        struct scsi_eh_save ses;
+        int rtn;
+
+        scsi_eh_prep_cmnd(scmd, &ses, cmnd, cmnd_size, sense_bytes);
         shost->eh_action = &done;
 
         spin_lock_irqsave(shost->host_lock, flags);
@@ -711,17 +754,7 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, unsigned char *cmnd,
                 rtn = FAILED;
         }
 
-
-        /*
-         * Restore original data
-         */
-        scmd->request_buffer = old_buffer;
-        scmd->request_bufflen = old_bufflen;
-        memcpy(scmd->cmnd, old_cmnd, sizeof(scmd->cmnd));
-        scmd->sc_data_direction = old_data_direction;
-        scmd->cmd_len = old_cmd_len;
-        scmd->use_sg = old_use_sg;
-        scmd->result = old_result;
+        scsi_eh_restore_cmnd(scmd, &ses);
         return rtn;
 }
 
@@ -736,10 +769,7 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, unsigned char *cmnd,
  **/
 static int scsi_request_sense(struct scsi_cmnd *scmd)
 {
-        static unsigned char generic_sense[6] =
-                {REQUEST_SENSE, 0, 0, 0, 252, 0};
-
-        return scsi_send_eh_cmnd(scmd, generic_sense, 6, SENSE_TIMEOUT, 1);
+        return scsi_send_eh_cmnd(scmd, NULL, 0, SENSE_TIMEOUT, ~0);
 }
 
 /**
@@ -1136,9 +1166,8 @@ static void scsi_eh_offline_sdevs(struct list_head *work_q,
         struct scsi_cmnd *scmd, *next;
 
         list_for_each_entry_safe(scmd, next, work_q, eh_entry) {
-                sdev_printk(KERN_INFO, scmd->device,
-                            "scsi: Device offlined - not"
-                            " ready after error recovery\n");
+                sdev_printk(KERN_INFO, scmd->device, "Device offlined - "
+                            "not ready after error recovery\n");
                 scsi_device_set_state(scmd->device, SDEV_OFFLINE);
                 if (scmd->eh_eflags & SCSI_EH_CANCEL_CMD) {
                         /*
@@ -1671,7 +1700,6 @@ scsi_reset_provider(struct scsi_device *dev, int flag)
         memset(&scmd->cmnd, '\0', sizeof(scmd->cmnd));
     
         scmd->scsi_done         = scsi_reset_provider_done_command;
-        scmd->done                      = NULL;
         scmd->request_buffer            = NULL;
         scmd->request_bufflen           = 0;
 
@@ -1681,12 +1709,6 @@ scsi_reset_provider(struct scsi_device *dev, int flag)
 
         init_timer(&scmd->eh_timeout);
 
-        /*
-         * Sometimes the command can get back into the timer chain,
-         * so use the pid as an identifier.
-         */
-        scmd->pid                       = 0;
-
         spin_lock_irqsave(shost->host_lock, flags);
         shost->tmf_in_progress = 1;
         spin_unlock_irqrestore(shost->host_lock, flags);