Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / scsi / scsi_lib.c

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index ce62e8798cc80da072b452bced0a26fb44b5eb11..db8c449282f9888340b99e25942b1f65d8fd4e9c 100644 (file)
--- 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);
+       }
 }
 
 /*
@@ -733,12 +735,13 @@ static bool scsi_end_request(struct request *req, int error,
        } else {
                unsigned long flags;
 
+               if (bidi_bytes)
+                       scsi_release_bidi_buffers(cmd);
+
                spin_lock_irqsave(q->queue_lock, flags);
                blk_finish_request(req, error);
                spin_unlock_irqrestore(q->queue_lock, flags);
 
-               if (bidi_bytes)
-                       scsi_release_bidi_buffers(cmd);
                scsi_release_buffers(cmd);
                scsi_next_command(cmd);
        }
@@ -1808,7 +1811,6 @@ static int scsi_mq_prep_fn(struct request *req)
 
        cmd->tag = req->tag;
 
-       req->cmd = req->__cmd;
        cmd->cmnd = req->cmd;
        cmd->prot_op = SCSI_PROT_NORMAL;
 
@@ -1816,13 +1818,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;