Merge branch 'nfs-for-2.6.37' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

[~andy/linux] / include / scsi / scsi_transport_fc.h

diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
index 9f98fca9b763d5b57777fb94d02126129a202c99..59816fe31e6853668458640a4a46ac586f3909fb 100644 (file)
--- a/include/scsi/scsi_transport_fc.h
+++ b/include/scsi/scsi_transport_fc.h
@@ -496,7 +496,7 @@ struct fc_host_attrs {
        u64 fabric_name;
        char symbolic_name[FC_SYMBOLIC_NAME_SIZE];
        char system_hostname[FC_SYMBOLIC_NAME_SIZE];
-       u32 def_dev_loss_tmo;
+       u32 dev_loss_tmo;
 
        /* Private (Transport-managed) Attributes */
        enum fc_tgtid_binding_type  tgtid_bind_type;
@@ -581,8 +581,8 @@ struct fc_host_attrs {
        (((struct fc_host_attrs *)(x)->shost_data)->devloss_work_q_name)
 #define fc_host_devloss_work_q(x) \
        (((struct fc_host_attrs *)(x)->shost_data)->devloss_work_q)
-#define fc_host_def_dev_loss_tmo(x) \
-       (((struct fc_host_attrs *)(x)->shost_data)->def_dev_loss_tmo)
+#define fc_host_dev_loss_tmo(x) \
+       (((struct fc_host_attrs *)(x)->shost_data)->dev_loss_tmo)
 
 
 struct fc_bsg_buffer {
@@ -643,7 +643,6 @@ struct fc_function_template {
        void    (*get_host_fabric_name)(struct Scsi_Host *);
        void    (*get_host_symbolic_name)(struct Scsi_Host *);
        void    (*set_host_system_hostname)(struct Scsi_Host *);
-       void    (*get_host_def_dev_loss_tmo)(struct Scsi_Host *);
 
        struct fc_host_statistics * (*get_fc_host_stats)(struct Scsi_Host *);
        void    (*reset_fc_host_stats)(struct Scsi_Host *);