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

diff --git a/lustre/include/lustre_import.h b/lustre/include/lustre_import.h
index 1182308..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,8 +70,13 @@ struct adaptive_timeout {
 	spinlock_t	at_lock;
 };
 
+enum lustre_at_flags {
+	LATF_SKIP	= 0x0,
+	LATF_STATS	= 0x1,
+};
+
 struct ptlrpc_at_array {
-        cfs_list_t       *paa_reqs_array; /** array to hold requests */
+	struct list_head *paa_reqs_array; /** array to hold requests */
         __u32             paa_size;       /** the size of array */
         __u32             paa_count;      /** the total count of reqs */
         time_t            paa_deadline;   /** the earliest deadline of reqs */
@@ -132,9 +137,9 @@ enum obd_import_event {
  * Definition of import connection structure
  */
 struct obd_import_conn {
-        /** Item for linking connections together */
-        cfs_list_t                oic_item;
-        /** Pointer to actual PortalRPC connection */
+	/** Item for linking connections together */
+	struct list_head	  oic_item;
+	/** Pointer to actual PortalRPC connection */
         struct ptlrpc_connection *oic_conn;
         /** uuid of remote side */
         struct obd_uuid           oic_uuid;
@@ -165,19 +170,19 @@ struct obd_import {
 	struct ptlrpc_connection *imp_connection;
         /** PortalRPC client structure for this import */
         struct ptlrpc_client     *imp_client;
-        /** List element for linking into pinger chain */
-        cfs_list_t                imp_pinger_chain;
-        /** List element for linking into chain for destruction */
-        cfs_list_t                imp_zombie_chain;
+	/** List element for linking into pinger chain */
+	struct list_head	  imp_pinger_chain;
+	/** List element for linking into chain for destruction */
+	struct list_head	  imp_zombie_chain;
 
         /**
          * Lists of requests that are retained for replay, waiting for a reply,
          * or waiting for recovery to complete, respectively.
          * @{
          */
-        cfs_list_t                imp_replay_list;
-        cfs_list_t                imp_sending_list;
-        cfs_list_t                imp_delayed_list;
+	struct list_head	imp_replay_list;
+	struct list_head	imp_sending_list;
+	struct list_head	imp_delayed_list;
         /** @} */
 
 	/**
@@ -187,12 +192,12 @@ struct obd_import {
 	 * The imp_replay_cursor is for accelerating searching during replay.
 	 * @{
 	 */
-	cfs_list_t		  imp_committed_list;
-	cfs_list_t		 *imp_replay_cursor;
+	struct list_head	imp_committed_list;
+	struct list_head	*imp_replay_cursor;
 	/** @} */
 
-        /** obd device for this import */
-        struct obd_device        *imp_obd;
+	/** obd device for this import */
+	struct obd_device	*imp_obd;
 
         /**
          * some seciruty-related fields
@@ -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,11 +255,11 @@ 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. */
-        cfs_list_t                imp_conn_list;
+	struct list_head	imp_conn_list;
         /**
          * Current connection. \a imp_connection is imp_conn_current->oic_conn
          */
@@ -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,