Merge branch 'upstream'

1 files changed, 5 insertions, 0 deletions

diff --git a/include/scsi/scsi_transport.h b/include/scsi/scsi_transport.h
index b3657f111937..cca1d4926d2a 100644
--- a/include/scsi/scsi_transport.h
+++ b/include/scsi/scsi_transport.h
@@ -50,6 +50,11 @@ struct scsi_transport_template {
         unsigned int create_work_queue : 1;
 
         /*
+         * Allows a transport to override the default error handler.
+         */
+        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: