- CROW-related fixes from b_hd_mdref

[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 b4b2fc9..1fc3263 100644 (file)
--- a/lustre/include/linux/lustre_export.h
+++ b/lustre/include/linux/lustre_export.h
@@ -14,6 +14,7 @@
 #include <linux/lustre_dlm.h>
 
 struct mds_client_data;
+struct mds_idmap_table;
 
 struct mds_export_data {
         struct list_head        med_open_head;
@@ -21,22 +22,19 @@ struct mds_export_data {
         struct mds_client_data *med_mcd;
         loff_t                  med_off;
         int                     med_idx;
+        unsigned int            med_initialized:1,
+                                med_remote:1;
+        __u32                   med_nllu;
+        __u32                   med_nllg;
+        struct mds_idmap_table *med_idmap;
 };
 
 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
-        obd_id                  oscc_gr;
-        int                     oscc_grow_count;
-        int                     oscc_max_grow_count;
-        int                     oscc_kick_barrier;
-        struct osc_created     *oscc_osccd;
-        struct obdo             oscc_oa;
+        struct obd_device      *oscc_obd;
         int                     oscc_flags;
-        wait_queue_head_t       oscc_waitq; /* creating procs wait on this */
+        obd_id                  oscc_next_id;
+        wait_queue_head_t       oscc_waitq;
 };
 
 struct ldlm_export_data {
@@ -56,9 +54,9 @@ struct filter_export_data {
         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 */
+        long                       fed_dirty;    /* in bytes */
+        long                       fed_grant;    /* in bytes */
+        long                       fed_pending;  /* bytes just being written */
 };
 
 struct obd_export {
@@ -76,10 +74,13 @@ struct obd_export {
         time_t                    exp_last_request_time;
         spinlock_t                exp_lock; /* protects flags int below */
         /* ^ protects exp_outstanding_replies too */
-        int                       exp_flags;
+        unsigned long             exp_flags;
         int                       exp_failed:1,
-                                  exp_replay_needed:1,
-                                  exp_libclient:1; /* liblustre client? */
+                                  exp_req_replay_needed:1,
+                                  exp_lock_replay_needed:1,
+                                  exp_connected:1,
+                                  exp_libclient:1, /* liblustre client? */
+                                  exp_sync:1;
         union {
                 struct mds_export_data    eu_mds_data;
                 struct filter_export_data eu_filter_data;