scsi_error: set DID_TIME_OUT correctly
authorHannes Reinecke <hare@suse.de>
Fri, 13 Jun 2014 12:01:45 +0000 (14:01 +0200)
committerChristoph Hellwig <hch@lst.de>
Tue, 24 Jun 2014 15:00:12 +0000 (17:00 +0200)
commita33c070bced8b283e22e8dbae35177a033b810bf
treec10c10d581480bab2376f9529f13aafaea81187e
parent8922a908908ff947f1f211e07e2e97f1169ad3cb
scsi_error: set DID_TIME_OUT correctly

Any callbacks in scsi_timeout_out() might return BLK_EH_RESET_TIMER,
in which case we should leave the result alone and not set
DID_TIME_OUT, as the command didn't actually timeout.

Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Ewan D. Milne <emilne@redhat.com>
drivers/scsi/scsi_error.c