]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
scsi: pm8001: Drop !task check in pm8001_abort_task()
authorJohn Garry <john.garry@huawei.com>
Wed, 26 Oct 2022 10:56:04 +0000 (18:56 +0800)
committerMartin K. Petersen <martin.petersen@oracle.com>
Thu, 27 Oct 2022 02:22:59 +0000 (02:22 +0000)
In commit 0b639decf651 ("scsi: pm8001: Modify task abort handling for SATA
task"), code was introduced to dereference "task" pointer in
pm8001_abort_task(). However there was a pre-existing later check for
"!task", which spooked the kernel test robot.

Function pm8001_abort_task() should never be passed NULL for "task"
pointer, so remove that check. Also remove the "unlikely" hint, as this is
not fastpath code.

Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: John Garry <john.garry@huawei.com>
Link: https://lore.kernel.org/r/1666781764-123090-1-git-send-email-john.garry@huawei.com
Reviewed-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Acked-by: Jack Wang <jinpu.wang@ionos.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/pm8001/pm8001_sas.c

index 2359e827c9e61be647603878a47ac948ed2bf9f0..e5673c774f66d7e3be116063fe4a8b31bf55be66 100644 (file)
@@ -979,7 +979,7 @@ int pm8001_abort_task(struct sas_task *task)
        u32 phy_id, port_id;
        struct sas_task_slow slow_task;
 
-       if (unlikely(!task || !task->lldd_task || !task->dev))
+       if (!task->lldd_task || !task->dev)
                return TMF_RESP_FUNC_FAILED;
 
        dev = task->dev;