- merge 0.7rc1 from b_devel to HEAD (20030612 merge point)

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

diff --git a/lustre/include/linux/lustre_import.h b/lustre/include/linux/lustre_import.h
index 4fc2581..c1af641 100644 (file)
--- a/lustre/include/linux/lustre_import.h
+++ b/lustre/include/linux/lustre_import.h
@@ -10,21 +10,17 @@
 #ifndef __IMPORT_H
 #define __IMPORT_H
 
-
-#define IMP_INVALID       1
-#define IMP_REPLAYABLE    2
-
-
-struct obd_import;
-typedef int (*import_recover_t)(struct obd_import *imp, int phase);
+#include <linux/lustre_handles.h>
 #include <linux/lustre_idl.h>
 
 struct obd_import {
-        import_recover_t          imp_recover;
+        struct portals_handle     imp_handle;
+        atomic_t                  imp_refcount;
+        struct lustre_handle      imp_dlm_handle; /* client's ldlm export */
         struct ptlrpc_connection *imp_connection;
         struct ptlrpc_client     *imp_client;
-        struct lustre_handle      imp_handle;
-        struct list_head          imp_chain;
+        struct list_head          imp_observers;
+        struct list_head          imp_pinger_chain;
 
         /* Lists of requests that are retained for replay, waiting for a reply,
          * or waiting for recovery to complete, respectively.
@@ -34,17 +30,43 @@ struct obd_import {
         struct list_head          imp_delayed_list;
 
         struct obd_device        *imp_obd;
-        int                       imp_flags;
         int                       imp_level;
+        int                       imp_generation;
         __u64                     imp_max_transno;
         __u64                     imp_peer_committed_transno;
+        struct obd_uuid           imp_target_uuid; /* XXX -> lustre_name */
+        struct lustre_handle      imp_remote_handle;
 
-        /* Protects flags, level, *_list */
+        /* Protects flags, level, generation, *_list */
         spinlock_t                imp_lock;
+
+        /* flags */
+        int                       imp_invalid:1, imp_replayable:1,
+                                  imp_dlm_fake:1;
+        __u32                     imp_connect_op;
+};
+
+typedef void (*obd_import_callback)(struct obd_import *imp, void *closure,
+                                    int event, void *event_arg, void *cb_data);
+
+struct obd_import_observer {
+        struct list_head     oio_chain;
+        obd_import_callback  oio_cb;
+        void                *oio_cb_data;
 };
 
+void class_observe_import(struct obd_import *imp, obd_import_callback cb,
+                          void *cb_data);
+void class_unobserve_import(struct obd_import *imp, obd_import_callback cb,
+                            void *cb_data);
+void class_notify_import_observers(struct obd_import *imp, int event,
+                                   void *event_arg);
+
+#define IMP_EVENT_ACTIVE   1
+#define IMP_EVENT_INACTIVE 2
+
+/* genops.c */
 extern struct obd_import *class_conn2cliimp(struct lustre_handle *);
 extern struct obd_import *class_conn2ldlmimp(struct lustre_handle *);
 
-
 #endif /* __IMPORT_H */