From: Hannes Reinecke Date: Tue, 27 Apr 2021 08:30:17 +0000 (+0200) Subject: scsi: core: Use DID_TIME_OUT instead of DRIVER_TIMEOUT X-Git-Tag: accepted/tizen/unified/20230118.172025~6832^2~133^2~29 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4bd51e54e16ad0b0dba4feb0fdb70861feb2869d;p=platform%2Fkernel%2Flinux-rpi.git 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: Bart Van Assche Signed-off-by: Hannes Reinecke Signed-off-by: Martin K. Petersen --- diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c index 0967021..689ee62 100644 --- a/drivers/scsi/scsi_error.c +++ b/drivers/scsi/scsi_error.c @@ -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",