ORNL-10: Basic IR implementation

[fs/lustre-release.git] / lustre / include / obd.h

diff --git a/lustre/include/obd.h b/lustre/include/obd.h
index 9d7a61f..08d483f 100644 (file)
--- a/lustre/include/obd.h
+++ b/lustre/include/obd.h
@@ -233,6 +233,7 @@ struct ost_server_data;
 /* hold common fields for "target" device */
 struct obd_device_target {
         __u32                     obt_magic;
+        __u32                     obt_instance;
         struct super_block       *obt_sb;
         /** last_rcvd file */
         struct file              *obt_rcvd_filp;
@@ -505,6 +506,7 @@ struct mgs_obd {
         cfs_list_t                       mgs_fs_db_list;
         cfs_semaphore_t                  mgs_sem;
         cfs_proc_dir_entry_t            *mgs_proc_live;
+        cfs_time_t                       mgs_start_time;
 };
 
 struct mds_obd {
@@ -1014,6 +1016,7 @@ struct obd_device {
                       obd_no_conn:1,       /* deny new connections */
                       obd_inactive:1,      /* device active/inactive
                                            * (for /proc/status only!!) */
+                      obd_no_ir:1,         /* no imperative recovery. */
                       obd_process_conf:1;  /* device is processing mgs config */
         /* use separate field as it is set in interrupt to don't mess with
          * protection of other bits using _bh lock */
@@ -1067,8 +1070,9 @@ struct obd_device {
         cfs_timer_t                      obd_recovery_timer;
         time_t                           obd_recovery_start; /* seconds */
         time_t                           obd_recovery_end; /* seconds, for lprocfs_status */
-        time_t                           obd_recovery_time_hard;
+        int                              obd_recovery_time_hard;
         int                              obd_recovery_timeout;
+        int                              obd_recovery_ir_factor;
 
         /* new recovery stuff from CMD2 */
         struct target_recovery_data      obd_recovery_data;
@@ -1167,7 +1171,6 @@ enum obd_cleanup_stage {
 #define KEY_CONNECT_FLAG        "connect_flags"
 #define KEY_SYNC_LOCK_CANCEL    "sync_lock_cancel"
 
-
 struct lu_context;
 
 /* /!\ must be coherent with include/linux/namei.h on patched kernel */