]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
scsi: hisi_sas: fix internal abort slot timeout bug
authorXiang Chen <chenxiang66@hisilicon.com>
Tue, 24 Oct 2017 15:51:32 +0000 (23:51 +0800)
committerKhalid Elmously <khalid.elmously@canonical.com>
Fri, 16 Feb 2018 17:42:12 +0000 (12:42 -0500)
BugLink: https://bugs.launchpad.net/bugs/1739807
When an internal abort times out in hisi_sas_internal_task_abort(),
goto the exit label in and not go through the other task status
checks.

Signed-off-by: Xiang Chen <chenxiang66@hisilicon.com>
Signed-off-by: John Garry <john.garry@huawei.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
(cherry picked from commit f692a677e2cb0ccab4ef91be97d8fb020cca246d)
Signed-off-by: dann frazier <dann.frazier@canonical.com>
Acked-by: Paolo Pisati <paolo.pisati@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
drivers/scsi/hisi_sas/hisi_sas_main.c

index da1de7951fdcf9a19df3f4a370889cadaac5b8e5..53a5c5387824f55c2c6bc37e7534dca02ac4ad6f 100644 (file)
@@ -1453,6 +1453,7 @@ hisi_sas_internal_task_abort(struct hisi_hba *hisi_hba,
                        if (slot)
                                slot->task = NULL;
                        dev_err(dev, "internal task abort: timeout.\n");
+                       goto exit;
                }
        }