scsi: hisi_sas: Fix return value when get_free_slot() failed
authorXiaofei Tan <tanxiaofei@huawei.com>
Mon, 21 May 2018 10:09:24 +0000 (18:09 +0800)
committerMartin K. Petersen <martin.petersen@oracle.com>
Tue, 29 May 2018 02:40:32 +0000 (22:40 -0400)
It is an step of executing task to get free slot. If the step fails, we
will cleanup LLDD resources and should return failure to upper layer or
internal caller to abort task execution of this time.

But in the current code, the caller of get_free_slot() doesn't return
failure when get_free_slot() failed. This patch is to fix it.

Signed-off-by: Xiaofei Tan <tanxiaofei@huawei.com>
Signed-off-by: John Garry <john.garry@huawei.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/hisi_sas/hisi_sas_main.c

index cd55849..3028024 100644 (file)
@@ -443,6 +443,7 @@ static int hisi_sas_task_prep(struct sas_task *task,
        wr_q_index = hisi_hba->hw->get_free_slot(hisi_hba, dq);
        if (wr_q_index < 0) {
                spin_unlock_irqrestore(&dq->lock, flags_dq);
+               rc = -EAGAIN;
                goto err_out_buf;
        }
 
@@ -1708,6 +1709,7 @@ hisi_sas_internal_abort_task_exec(struct hisi_hba *hisi_hba, int device_id,
        wr_q_index = hisi_hba->hw->get_free_slot(hisi_hba, dq);
        if (wr_q_index < 0) {
                spin_unlock_irqrestore(&dq->lock, flags_dq);
+               rc = -EAGAIN;
                goto err_out_buf;
        }
        list_add_tail(&slot->delivery, &dq->list);