1 files changed, 10 insertions, 6 deletions

diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 184bcaeaf812..1cb5f7d4f278 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -68,6 +68,8 @@
 #include "scsi_priv.h"
 #include "scsi_logging.h"
 
+static void scsi_done(struct scsi_cmnd *cmd);
+static int scsi_retry_command(struct scsi_cmnd *cmd);
 
 /*
  * Definitions and constants.
@@ -638,10 +640,12 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
         }
         spin_unlock_irqrestore(host->host_lock, flags);
         if (rtn) {
-                atomic_inc(&cmd->device->iodone_cnt);
-                scsi_queue_insert(cmd,
-                                (rtn == SCSI_MLQUEUE_DEVICE_BUSY) ?
-                                 rtn : SCSI_MLQUEUE_HOST_BUSY);
+                if (scsi_delete_timer(cmd)) {
+                        atomic_inc(&cmd->device->iodone_cnt);
+                        scsi_queue_insert(cmd,
+                                          (rtn == SCSI_MLQUEUE_DEVICE_BUSY) ?
+                                          rtn : SCSI_MLQUEUE_HOST_BUSY);
+                }
                 SCSI_LOG_MLQUEUE(3,
                     printk("queuecommand : request rejected\n"));
         }
@@ -739,7 +743,7 @@ static DEFINE_PER_CPU(struct list_head, scsi_done_q);
  *
  * This function is interrupt context safe.
  */
-void scsi_done(struct scsi_cmnd *cmd)
+static void scsi_done(struct scsi_cmnd *cmd)
 {
         /*
          * We don't have to worry about this one timing out any more.
@@ -834,7 +838,7 @@ static void scsi_softirq(struct softirq_action *h)
  *              level drivers should not become re-entrant as a result of
  *              this.
  */
-int scsi_retry_command(struct scsi_cmnd *cmd)
+static int scsi_retry_command(struct scsi_cmnd *cmd)
 {
         /*
          * Restore the SCSI command state.