X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_import.h;h=0e34d554aeeab726a24ac0dda69f3ba0c65ee8e6;hb=8ed361345154138473707855b2030bad371e96dd;hp=c1c17bd249e8f6d20d6e1d47b517606febd36333;hpb=135fea8fa986d7abf107953b5b9a57170a418eda;p=fs%2Flustre-release.git

diff --git a/lustre/include/lustre_import.h b/lustre/include/lustre_import.h
index c1c17bd..0e34d55 100644
--- a/lustre/include/lustre_import.h
+++ b/lustre/include/lustre_import.h
@@ -42,9 +42,14 @@
  *
  * @{
  */
+#include <linux/atomic.h>
+#include <linux/list.h>
+#include <linux/mutex.h>
+#include <linux/spinlock.h>
+#include <linux/time.h>
+#include <linux/types.h>
 #include <linux/workqueue.h>
-
-#include <lustre_handles.h>
+#include <libcfs/libcfs.h>
 #include <uapi/linux/lustre/lustre_idl.h>
 
 /**
@@ -101,19 +106,21 @@ enum lustre_imp_state {
         LUSTRE_IMP_RECOVER    = 8,
         LUSTRE_IMP_FULL       = 9,
         LUSTRE_IMP_EVICTED    = 10,
+	LUSTRE_IMP_IDLE	      = 11,
+	LUSTRE_IMP_LAST
 };
 
 /** Returns test string representation of numeric import state \a state */
 static inline char * ptlrpc_import_state_name(enum lustre_imp_state state)
 {
-        static char* import_state_names[] = {
-                "<UNKNOWN>", "CLOSED",  "NEW", "DISCONN",
-                "CONNECTING", "REPLAY", "REPLAY_LOCKS", "REPLAY_WAIT",
-                "RECOVER", "FULL", "EVICTED",
-        };
-
-        LASSERT (state <= LUSTRE_IMP_EVICTED);
-        return import_state_names[state];
+	static char *import_state_names[] = {
+		"<UNKNOWN>", "CLOSED",  "NEW", "DISCONN",
+		"CONNECTING", "REPLAY", "REPLAY_LOCKS", "REPLAY_WAIT",
+		"RECOVER", "FULL", "EVICTED", "IDLE",
+	};
+
+	LASSERT(state < LUSTRE_IMP_LAST);
+	return import_state_names[state];
 }
 
 /**
@@ -157,8 +164,6 @@ struct import_state_hist {
  * Imports are representing client-side view to remote target.
  */
 struct obd_import {
-	/** Local handle (== id) for this import. */
-	struct portals_handle     imp_handle;
 	/** Reference counter */
 	atomic_t                  imp_refcount;
 	struct lustre_handle      imp_dlm_handle; /* client's ldlm export */
@@ -205,7 +210,7 @@ struct obd_import {
          * @{
          */
 	struct ptlrpc_sec        *imp_sec;
-	struct mutex		  imp_sec_mutex;
+	rwlock_t		  imp_sec_lock;
 	time64_t		imp_sec_expire;
 	pid_t			  imp_sec_refpid;
         /** @} */
@@ -232,6 +237,8 @@ struct obd_import {
         int                       imp_state_hist_idx;
         /** Current import generation. Incremented on every reconnect */
         int                       imp_generation;
+	/** Idle connection initiated at this generation */
+	int			  imp_initiated_at;
         /** Incremented every time we send reconnection request */
         __u32                     imp_conn_cnt;
        /** 
@@ -295,10 +302,6 @@ 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,
@@ -306,11 +309,13 @@ struct obd_import {
 				  imp_connect_tried:1,
 				  /* connected but not FULL yet */
 				  imp_connected:1;
-	__u32                     imp_connect_op;
-	struct obd_connect_data   imp_connect_data;
-	__u64                     imp_connect_flags_orig;
-	__u64                     imp_connect_flags2_orig;
-	int                       imp_connect_error;
+	u32			  imp_connect_op;
+	u32			  imp_idle_timeout;
+	u32			  imp_idle_debug;
+	struct obd_connect_data	  imp_connect_data;
+	__u64			  imp_connect_flags_orig;
+	__u64			  imp_connect_flags2_orig;
+	int			  imp_connect_error;
 
 	enum lustre_msg_magic	imp_msg_magic;
 				/* adjusted based on server capability */
@@ -378,7 +383,6 @@ extern unsigned int at_max;
 /* genops.c */
 struct obd_export;
 extern struct obd_import *class_exp2cliimp(struct obd_export *);
-extern struct obd_import *class_conn2cliimp(struct lustre_handle *);
 
 /** @} import */