1 files changed, 27 insertions, 18 deletions

diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index c59f31533ab4..fafc00deaade 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -156,8 +156,7 @@ static struct scsi_host_cmd_pool scsi_cmd_dma_pool = {
 
 static DEFINE_MUTEX(host_cmd_pool_mutex);
 
-static struct scsi_cmnd *__scsi_get_command(struct Scsi_Host *shost,
-                                            gfp_t gfp_mask)
+struct scsi_cmnd *__scsi_get_command(struct Scsi_Host *shost, gfp_t gfp_mask)
 {
         struct scsi_cmnd *cmd;
 
@@ -178,6 +177,7 @@ static struct scsi_cmnd *__scsi_get_command(struct Scsi_Host *shost,
 
         return cmd;
 }
+EXPORT_SYMBOL_GPL(__scsi_get_command);
 
 /*
  * Function:    scsi_get_command()
@@ -214,9 +214,29 @@ struct scsi_cmnd *scsi_get_command(struct scsi_device *dev, gfp_t gfp_mask)
                 put_device(&dev->sdev_gendev);
 
         return cmd;
-}                               
+}
 EXPORT_SYMBOL(scsi_get_command);
 
+void __scsi_put_command(struct Scsi_Host *shost, struct scsi_cmnd *cmd,
+                        struct device *dev)
+{
+        unsigned long flags;
+
+        /* changing locks here, don't need to restore the irq state */
+        spin_lock_irqsave(&shost->free_list_lock, flags);
+        if (unlikely(list_empty(&shost->free_list))) {
+                list_add(&cmd->list, &shost->free_list);
+                cmd = NULL;
+        }
+        spin_unlock_irqrestore(&shost->free_list_lock, flags);
+
+        if (likely(cmd != NULL))
+                kmem_cache_free(shost->cmd_pool->slab, cmd);
+
+        put_device(dev);
+}
+EXPORT_SYMBOL(__scsi_put_command);
+
 /*
  * Function:    scsi_put_command()
  *
@@ -231,26 +251,15 @@ EXPORT_SYMBOL(scsi_get_command);
 void scsi_put_command(struct scsi_cmnd *cmd)
 {
         struct scsi_device *sdev = cmd->device;
-        struct Scsi_Host *shost = sdev->host;
         unsigned long flags;
-        
+
         /* serious error if the command hasn't come from a device list */
         spin_lock_irqsave(&cmd->device->list_lock, flags);
         BUG_ON(list_empty(&cmd->list));
         list_del_init(&cmd->list);
-        spin_unlock(&cmd->device->list_lock);
-        /* changing locks here, don't need to restore the irq state */
-        spin_lock(&shost->free_list_lock);
-        if (unlikely(list_empty(&shost->free_list))) {
-                list_add(&cmd->list, &shost->free_list);
-                cmd = NULL;
-        }
-        spin_unlock_irqrestore(&shost->free_list_lock, flags);
-
-        if (likely(cmd != NULL))
-                kmem_cache_free(shost->cmd_pool->slab, cmd);
+        spin_unlock_irqrestore(&cmd->device->list_lock, flags);
 
-        put_device(&sdev->sdev_gendev);
+        __scsi_put_command(cmd->device->host, cmd, &sdev->sdev_gendev);
 }
 EXPORT_SYMBOL(scsi_put_command);
 
@@ -871,9 +880,9 @@ EXPORT_SYMBOL(scsi_device_get);
  */
 void scsi_device_put(struct scsi_device *sdev)
 {
+#ifdef CONFIG_MODULE_UNLOAD
         struct module *module = sdev->host->hostt->module;
 
-#ifdef CONFIG_MODULE_UNLOAD
         /* The module refcount will be zero if scsi_device_get()
          * was called from a module removal routine */
         if (module && module_refcount(module) != 0)