1 files changed, 12 insertions, 12 deletions

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index d837dc180522..b9a8ddd77eef 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -645,16 +645,18 @@ static void scsi_mq_free_sgtables(struct scsi_cmnd *cmd)
 static void scsi_mq_uninit_cmd(struct scsi_cmnd *cmd)
 {
         struct scsi_device *sdev = cmd->device;
+        struct Scsi_Host *shost = sdev->host;
         unsigned long flags;
 
-        BUG_ON(list_empty(&cmd->list));
-
         scsi_mq_free_sgtables(cmd);
         scsi_uninit_cmd(cmd);
 
-        spin_lock_irqsave(&sdev->list_lock, flags);
-        list_del_init(&cmd->list);
-        spin_unlock_irqrestore(&sdev->list_lock, flags);
+        if (shost->use_cmd_list) {
+                BUG_ON(list_empty(&cmd->list));
+                spin_lock_irqsave(&sdev->list_lock, flags);
+                list_del_init(&cmd->list);
+                spin_unlock_irqrestore(&sdev->list_lock, flags);
+        }
 }
 
 /*
@@ -1815,13 +1817,11 @@ static int scsi_mq_prep_fn(struct request *req)
         INIT_DELAYED_WORK(&cmd->abort_work, scmd_eh_abort_handler);
         cmd->jiffies_at_alloc = jiffies;
 
-        /*
-         * XXX: cmd_list lookups are only used by two drivers, try to get
-         * rid of this list in common code.
-         */
-        spin_lock_irq(&sdev->list_lock);
-        list_add_tail(&cmd->list, &sdev->cmd_list);
-        spin_unlock_irq(&sdev->list_lock);
+        if (shost->use_cmd_list) {
+                spin_lock_irq(&sdev->list_lock);
+                list_add_tail(&cmd->list, &sdev->cmd_list);
+                spin_unlock_irq(&sdev->list_lock);
+        }
 
         sg = (void *)cmd + sizeof(struct scsi_cmnd) + shost->hostt->cmd_size;
         cmd->sdb.table.sgl = sg;