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 <bvanassche@acm.org>
Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 0967021cc06ec991dc96b895daa0df6d77258c73..689ee628eff9ee7c21899a4ba7c3c553c5b7ab48 100644 (file)
--- 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",