Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c69e6f81 authored by James Bottomley's avatar James Bottomley
Browse files

[SCSI] More USB deadlock fixes 



This patch fixes a corner case in the previous USB Deadlock fix patch (12023e7
[SCSI] Fix USB deadlock caused by SCSI error handling).

The scenario is abort command, set flag, abort completes, send TUR, TUR
doesn't return, so we now try to abort the TUR, but scsi_abort_eh_cmnd()
will skip the abort because the flag is set and move straight to reset.

Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 7daf4804

drivers/scsi/scsi_error.c

+1 −0
Original line number Diff line number Diff line
@@ -921,6 +921,7 @@ void scsi_eh_prep_cmnd(struct scsi_cmnd *scmd, struct scsi_eh_save *ses, 
	ses->prot_op = scmd->prot_op;



	scmd->prot_op = SCSI_PROT_NORMAL;

	scmd->eh_eflags = 0;

	scmd->cmnd = ses->eh_cmnd;

	memset(scmd->cmnd, 0, BLK_MAX_CDB);

	memset(&scmd->sdb, 0, sizeof(scmd->sdb));