scsi: libsas: Remove useless dev_list delete in sas_ex_discover_end_dev()
authorJason Yan <yanaijie@huawei.com>
Wed, 14 Dec 2022 13:38:06 +0000 (21:38 +0800)
committerMartin K. Petersen <martin.petersen@oracle.com>
Fri, 30 Dec 2022 16:59:11 +0000 (16:59 +0000)
The domain device 'child' is allocated in sas_ex_discover_end_dev() and
used to be added to the dev_list in this function. After the following two
fixes the device is added to the disco_list instead. As a result, the
list_del() and locking left behind is now redundant.

Fixes: 87c8331fcf72 ("[SCSI] libsas: prevent domain rediscovery competing with ata error handling")
Fixes: 92625f9bff38 ("[SCSI] libsas: restore scan order")
Cc: John Garry <john.g.garry@oracle.com>
Signed-off-by: Jason Yan <yanaijie@huawei.com>
Reviewed-by: John Garry <john.g.garry@oracle.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/libsas/sas_expander.c

index a04cad620e9392414d41da68120a9cec6a79f8a8..29e1b93b0964c8a540a93d73bc1e843d00e33c6a 100644 (file)
@@ -875,9 +875,6 @@ static struct domain_device *sas_ex_discover_end_dev(
  out_list_del:
        sas_rphy_free(child->rphy);
        list_del(&child->disco_list_node);
-       spin_lock_irq(&parent->port->dev_list_lock);
-       list_del(&child->dev_list_node);
-       spin_unlock_irq(&parent->port->dev_list_lock);
  out_free:
        sas_port_delete(phy->port);
  out_err: