LU-11445 obd: remove portals handle from OBD import

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

diff --git a/lustre/include/lustre_import.h b/lustre/include/lustre_import.h
index dfa22bb..8f52c66 100644 (file)
--- 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>
 
 /**
@@ -159,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 */
@@ -306,12 +309,13 @@ struct obd_import {
                                  imp_connect_tried:1,
                                  /* connected but not FULL yet */
                                  imp_connected:1;
-       __u32                     imp_connect_op;
-       __u32                     imp_idle_timeout;
-       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 */
@@ -379,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 */