Commit 4bd51e54 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Martin K. Petersen
Browse files

scsi: core: Use DID_TIME_OUT instead of DRIVER_TIMEOUT 

Set DID_TIME_OUT instead of DRIVER_TIMEOUT when a command
is finally marked as failed after error recovery.

Link: https://lore.kernel.org/r/20210427083046.31620-12-hare@suse.de


Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 16576ad8

drivers/scsi/scsi_error.c

+2 −2
Original line number Diff line number Diff line
@@ -2137,10 +2137,10 @@ void scsi_eh_flush_done_q(struct list_head *done_q) 
			/*

			 * If just we got sense for the device (called

			 * scsi_eh_get_sense), scmd->result is already

			 * set, do not set DRIVER_TIMEOUT.

			 * set, do not set DID_TIME_OUT.

			 */

			if (!scmd->result)

				scmd->result |= (DRIVER_TIMEOUT << 24);

				scmd->result |= (DID_TIME_OUT << 16);

			SCSI_LOG_ERROR_RECOVERY(3,

				scmd_printk(KERN_INFO, scmd,

					     "%s: flush finish cmd\n",