From 3cbd78bbceff93dd74b81171ea633ef027022daa Mon Sep 17 00:00:00 2001 From: Shengwei Luo Date: Fri, 15 Aug 2025 15:08:15 +0800 Subject: [PATCH] Revert "scsi: hisi_sas: fix a issue related to timer of internal IO and SMP IO" driver inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/ICT6EL CVE: NA -------------------------------- This reverts commit bc6a11be78404eb39bd53a9f698c0ef8035587e6. Since the upstream solution 3875da8292ba ("scsi: hisi_sas: Fix a timeout race of driver internal and SMP IO") has been backported, revert the old solution. Fixes: bc6a11be7840 ("scsi: hisi_sas: Fix a timeout race of driver internal and SMP IO") Signed-off-by: Shengwei Luo --- drivers/scsi/hisi_sas/hisi_sas_main.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c index 6bccd36556f2..9637094e6840 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_main.c +++ b/drivers/scsi/hisi_sas/hisi_sas_main.c @@ -1009,10 +1009,6 @@ static void hisi_sas_do_release_task(struct hisi_hba *hisi_hba, struct sas_task if (!slot->is_internal && task->task_proto != SAS_PROTOCOL_SMP) task->task_state_flags |= SAS_TASK_STATE_DONE; spin_unlock_irqrestore(&task->task_state_lock, flags); - - if (slot->is_internal || (task->task_proto == SAS_PROTOCOL_SMP)) - if (task->task_done) - task->task_done(task); } hisi_sas_slot_task_free(hisi_hba, task, slot, need_lock); -- Gitee