diff options
| author | Hannes Reinecke <hare@suse.de> | 2021-04-27 10:30:17 +0200 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2021-06-01 04:48:22 +0200 |
| commit | 4bd51e54e16ad0b0dba4feb0fdb70861feb2869d (patch) | |
| tree | 21e4ac96779da04b8d8d94180617030794c9b070 | |
| parent | scsi: core: Do not use DRIVER_INVALID (diff) | |
| download | linux-4bd51e54e16ad0b0dba4feb0fdb70861feb2869d.tar.xz linux-4bd51e54e16ad0b0dba4feb0fdb70861feb2869d.zip | |
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>
| -rw-r--r-- | drivers/scsi/scsi_error.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c index 0967021cc06e..689ee628eff9 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", |