From 69c7da9cc3ebb41a7380073430478deba706138d Mon Sep 17 00:00:00 2001 From: Jason Yan Date: Mon, 29 Apr 2019 21:45:07 +0800 Subject: [PATCH] Revert "scsi: libsas: delete sas port out of the disco mutex" hulk inclusion category: bugfix bugzilla: 14264 CVE: NA --------------------------- This reverts commit d8fa4fd57afce5dfae2a8fc5f53002ff261578c3. This patch is to fix an issue in linux kernel 5.0. Hulk 4.19 does not need this patch. This will cause kernel panic when cascade expanders hotplugging. Signed-off-by: Jason Yan Reviewed-by: zhengbin Signed-off-by: Yang Yingliang --- drivers/scsi/libsas/sas_expander.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c index 721c6de7d8d9..562a967d111c 100644 --- a/drivers/scsi/libsas/sas_expander.c +++ b/drivers/scsi/libsas/sas_expander.c @@ -886,7 +886,7 @@ static struct domain_device *sas_ex_discover_end_dev( list_del(&child->dev_list_node); spin_unlock_irq(&parent->port->dev_list_lock); out_free: - list_add_tail(&phy->port->del_list, &parent->port->sas_port_del_list); + sas_port_delete(phy->port); out_err: phy->port = NULL; sas_put_device(child); -- GitLab