diff options
author | Christoph Hellwig <hch@lst.de> | 2017-01-30 13:18:58 +0100 |
---|---|---|
committer | Martin K. Petersen <martin.petersen@oracle.com> | 2017-02-06 19:10:03 -0500 |
commit | b6a05c823fc573a65efc4466f174abf05f922e0f (patch) | |
tree | 09ec066afc68cf223577217373614dc48251d649 /include/scsi/scsi_transport.h | |
parent | 28917d40e63a65c3923d45ed190c748e45b90ac7 (diff) | |
download | op-kernel-dev-b6a05c823fc573a65efc4466f174abf05f922e0f.zip op-kernel-dev-b6a05c823fc573a65efc4466f174abf05f922e0f.tar.gz |
scsi: remove eh_timed_out methods in the transport template
Instead define the timeout behavior purely based on the host_template
eh_timed_out method and wire up the existing transport implementations
in the host templates. This also clears up the confusion that the
transport template method overrides the host template one, so some
drivers have to re-override the transport template one.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'include/scsi/scsi_transport.h')
-rw-r--r-- | include/scsi/scsi_transport.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/include/scsi/scsi_transport.h b/include/scsi/scsi_transport.h index 8129239..6c3bb9f 100644 --- a/include/scsi/scsi_transport.h +++ b/include/scsi/scsi_transport.h @@ -58,17 +58,6 @@ struct scsi_transport_template { void (* eh_strategy_handler)(struct Scsi_Host *); /* - * This is an optional routine that allows the transport to become - * involved when a scsi io timer fires. The return value tells the - * timer routine how to finish the io timeout handling: - * EH_HANDLED: I fixed the error, please complete the command - * EH_RESET_TIMER: I need more time, reset the timer and - * begin counting again - * EH_NOT_HANDLED Begin normal error recovery - */ - enum blk_eh_timer_return (*eh_timed_out)(struct scsi_cmnd *); - - /* * Used as callback for the completion of i_t_nexus request * for target drivers. */ |