b=2264

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

diff --git a/lustre/include/linux/lustre_export.h b/lustre/include/linux/lustre_export.h
index 694bd3e..9be781f 100644 (file)
--- a/lustre/include/linux/lustre_export.h
+++ b/lustre/include/linux/lustre_export.h
@@ -12,31 +12,72 @@
 
 #include <linux/lustre_idl.h>
 #include <linux/lustre_dlm.h>
-#include <linux/lustre_mds.h>
-#include <linux/obd_filter.h>
 
-struct lov_export_data {
-        spinlock_t       led_lock;
-        struct list_head led_open_head;
+struct mds_client_data;
+
+struct mds_export_data {
+        struct list_head        med_open_head;
+        spinlock_t              med_open_lock;
+        struct mds_client_data *med_mcd;
+        loff_t                  med_off;
+        int                     med_idx;
+};
+
+struct osc_creator {
+        spinlock_t              oscc_lock;
+        struct list_head        oscc_list;
+        struct obd_device       *oscc_obd;
+        obd_id                  oscc_last_id;//last available pre-created object
+        obd_id                  oscc_next_id;// what object id to give out next
+        int                     oscc_initial_create_count;
+        int                     oscc_grow_count;
+        int                     oscc_kick_barrier;
+        struct osc_created     *oscc_osccd;
+        struct obdo             oscc_oa;
+        int                     oscc_flags;
+        wait_queue_head_t       oscc_waitq; /* creating procs wait on this */
+};
+
+struct ldlm_export_data {
+        struct list_head       led_held_locks; /* protected by namespace lock */
 };
 
 struct ec_export_data { /* echo client */
-        struct list_head eced_open_head;
         struct list_head eced_locks;
 };
 
+/* In-memory access to client data from OST struct */
+struct filter_client_data;
+struct filter_export_data {
+        spinlock_t                 fed_lock;      /* protects fed_open_head */
+        struct filter_client_data *fed_fcd;
+        loff_t                     fed_lr_off;
+        int                        fed_lr_idx;
+        unsigned long              fed_dirty;    /* in bytes */
+        unsigned long              fed_grant;    /* in bytes */
+        unsigned long              fed_pending;  /* bytes just being written */
+};
+
 struct obd_export {
-        __u64                     exp_cookie;
+        struct portals_handle     exp_handle;
+        atomic_t                  exp_refcount;
         struct obd_uuid           exp_client_uuid;
         struct list_head          exp_obd_chain;
-        struct list_head          exp_conn_chain;
         struct obd_device        *exp_obd;
+        struct obd_import        *exp_imp_reverse; /* to make RPCs backwards */
         struct ptlrpc_connection *exp_connection;
+        __u32                     exp_conn_cnt;
         struct ldlm_export_data   exp_ldlm_data;
+        struct list_head          exp_outstanding_replies;
+        time_t                    exp_last_request_time;
+        spinlock_t                exp_lock; /* protects flags int below */
+        /* ^ protects exp_outstanding_replies too */
+        int                       exp_flags;
+        int                       exp_failed:1;
+        int                       exp_libclient:1; /* liblustre client? */
         union {
                 struct mds_export_data    eu_mds_data;
                 struct filter_export_data eu_filter_data;
-                struct lov_export_data    eu_lov_data;
                 struct ec_export_data     eu_ec_data;
         } u;
 };