X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Finclude%2Flustre_import.h;h=8ae6648f42149659409405f4420e61098017f988;hp=a582f48404121209b17d682efae5307d70db8ec3;hb=f625f670afbe954030ff81f0f8522137d6cdd335;hpb=8701e7e4b5ec1b34700c95b9b6588f4745730b72

diff --git a/lustre/include/lustre_import.h b/lustre/include/lustre_import.h
index a582f48..8ae6648 100644
--- a/lustre/include/lustre_import.h
+++ b/lustre/include/lustre_import.h
@@ -27,7 +27,7 @@
  * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2013, Intel Corporation.
+ * Copyright (c) 2011, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -70,6 +70,11 @@ struct adaptive_timeout {
 	spinlock_t	at_lock;
 };
 
+enum lustre_at_flags {
+	LATF_SKIP	= 0x0,
+	LATF_STATS	= 0x1,
+};
+
 struct ptlrpc_at_array {
 	struct list_head *paa_reqs_array; /** array to hold requests */
         __u32             paa_size;       /** the size of array */
@@ -218,6 +223,8 @@ struct obd_import {
 	atomic_t                  imp_timeouts;
 	/** Current import state */
         enum lustre_imp_state     imp_state;
+	/** Last replay state */
+	enum lustre_imp_state     imp_replay_state;
         /** History of import states */
         struct import_state_hist  imp_state_hist[IMP_STATE_HIST_LEN];
         int                       imp_state_hist_idx;
@@ -248,7 +255,7 @@ struct obd_import {
         struct lustre_handle      imp_remote_handle;
         /** When to perform next ping. time in jiffies. */
         cfs_time_t                imp_next_ping;
-        /** When we last succesfully connected. time in 64bit jiffies */
+	/** When we last successfully connected. time in 64bit jiffies */
         __u64                     imp_last_success_conn;
 
         /** List of all possible connection for import. */
@@ -289,8 +296,10 @@ struct obd_import {
 				  imp_resend_replay:1,
 				  /* disable normal recovery, for test only. */
 				  imp_no_pinger_recover:1,
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0)
 				  /* need IR MNE swab */
 				  imp_need_mne_swab:1,
+#endif
 				  /* import must be reconnected instead of
 				   * chouse new connection */
 				  imp_force_reconnect:1,