Skip to contentSkip to conversation

scsi: ufs: Remove an unpaired ufshcd_scsi_unblock_requests() in err_handler()

PATCH Applied Can Guo 3 participants 3 messages Aug 19, 2020 – Sep 9, 2020 SCSI

lore
Share & tools
lore

Can Guo

author
#0 lore raw

PATCH v2 1/1 scsi: ufs: Remove an unpaired ufshcd_scsi_unblock_requests() in err_handler()

Commit 5586dd8ea250 ("scsi: ufs: Fix a race condition between error handler and runtime PM ops") moves the ufshcd_scsi_block_requests() inside err_handler(), but forgets to remove the ufshcd_scsi_unblock_requests() in the early return path. Correct the coding mistake.

Fixes 5586dd8ea250 ("scsi: ufs: Fix a race condition between error handler and runtime PM ops")

---

Change since v1:
- Added Fixes tag.

 drivers/scsi/ufs/ufshcd.c | 1 -
 1 file changed, 1 deletion(-)
drivers/scsi/ufs/ufshcd.c +0 -1
index 2b55c2e..b8441ad 100644
@@ -5670,7 +5670,6 @@ static void ufshcd_err_handler(struct work_struct *work)
 		if (hba->ufshcd_state != UFSHCD_STATE_ERROR)
 			hba->ufshcd_state = UFSHCD_STATE_OPERATIONAL;
 		spin_unlock_irqrestore(hba->host->host_lock, flags);
-		ufshcd_scsi_unblock_requests(hba);
 		return;
 	}
 	ufshcd_set_eh_in_progress(hba);
Signature · 1 line
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
Reviewed-by on v2 1/1
#1 lore raw
Quoted 7 lines · Can Guo

Commit 5586dd8ea250 ("scsi: ufs: Fix a race condition between error handler
and runtime PM ops") moves the ufshcd_scsi_block_requests() inside err_handler(), but forgets to remove the ufshcd_scsi_unblock_requests() in
the early return path. Correct the coding mistake.

Quoted 5 lines
Fixes 5586dd8ea250 ("scsi: ufs: Fix a race condition between error

handler and runtime PM ops")

#2 lore raw
In reply to Can Guo
Quoted 4 lines · Can Guo

Commit 5586dd8ea250 ("scsi: ufs: Fix a race condition between error handler and runtime PM ops") moves the ufshcd_scsi_block_requests() inside err_handler(), but forgets to remove the ufshcd_scsi_unblock_requests() in the early return path. Correct the coding mistake.

Applied to 5.10/scsi-queue, thanks!

[1/1] scsi: ufs: Remove an unpaired ufshcd_scsi_unblock_requests() in err_handler()

      https://git.kernel.org/mkp/scsi/c/50807f22c89f
Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering