Branch HEAD

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

diff --git a/lustre/include/lustre_export.h b/lustre/include/lustre_export.h
index 7e4c8b9..22e7197 100644 (file)
--- a/lustre/include/lustre_export.h
+++ b/lustre/include/lustre_export.h
@@ -15,23 +15,11 @@ struct mdt_client_data;
 struct mds_idmap_table;
 struct mdt_idmap_table;
 
-struct mds_export_data {
-        struct list_head        med_open_head;
-        spinlock_t              med_open_lock; /* lock med_open_head, mfd_list*/
-        struct mds_client_data *med_mcd;
-        __u64                   med_ibits_known;
-        loff_t                  med_lr_off;
-        int                     med_lr_idx;
-        unsigned int            med_rmtclient:1; /* remote client? */
-        struct semaphore           med_idmap_sem;
-        struct lustre_idmap_table *med_idmap;
-};
-
 struct mdt_export_data {
         struct list_head        med_open_head;
         spinlock_t              med_open_lock; /* lock med_open_head, mfd_list*/
-        struct semaphore        med_mcd_lock; 
-        struct mdt_client_data *med_mcd;
+        struct semaphore        med_lcd_lock;
+        struct lsd_client_data *med_lcd;
         __u64                   med_ibits_known;
         loff_t                  med_lr_off;
         int                     med_lr_idx;
@@ -47,6 +35,10 @@ struct osc_creator {
         obd_id                  oscc_last_id;//last available pre-created object
         obd_id                  oscc_next_id;// what object id to give out next
         int                     oscc_grow_count;
+        /**
+         * Limit oscc_grow_count value, can be changed via proc fs
+         */
+        int                     oscc_max_grow_count;
         struct obdo             oscc_oa;
         int                     oscc_flags;
         cfs_waitq_t             oscc_waitq; /* creating procs wait on this */
@@ -62,10 +54,9 @@ struct ec_export_data { /* echo client */
 };
 
 /* 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;
+        struct lsd_client_data    *fed_lcd;
         loff_t                     fed_lr_off;
         int                        fed_lr_idx;
         long                       fed_dirty;    /* in bytes */
@@ -77,6 +68,17 @@ struct filter_export_data {
         struct brw_stats           fed_brw_stats;
 };
 
+typedef struct nid_stat {
+        lnet_nid_t               nid;
+        struct hlist_node        nid_hash;
+        struct list_head         nid_list;
+        struct obd_device       *nid_obd;
+        struct proc_dir_entry   *nid_proc;
+        struct lprocfs_stats    *nid_stats;
+        struct brw_stats        *nid_brw_stats;
+        int                      nid_exp_ref_count;
+}nid_stat_t;
+
 struct obd_export {
         struct portals_handle     exp_handle;
         atomic_t                  exp_refcount;
@@ -89,8 +91,7 @@ struct obd_export {
         struct list_head          exp_obd_chain_timed;
         struct obd_device        *exp_obd;
         struct obd_import        *exp_imp_reverse; /* to make RPCs backwards */
-        struct proc_dir_entry    *exp_proc;
-        struct lprocfs_stats     *exp_ops_stats;
+        struct nid_stat          *exp_nid_stats;
         struct lprocfs_stats     *exp_md_stats;
         struct lprocfs_stats     *exp_ldlm_stats;
         struct ptlrpc_connection *exp_connection;
@@ -98,6 +99,7 @@ struct obd_export {
         struct ldlm_export_data   exp_ldlm_data;
         struct list_head          exp_outstanding_replies;
         time_t                    exp_last_request_time;
+        struct list_head          exp_req_replay_queue;
         spinlock_t                exp_lock; /* protects flags int below */
         /* ^ protects exp_outstanding_replies too */
         __u64                     exp_connect_flags;
@@ -119,16 +121,13 @@ struct obd_export {
         cfs_time_t                exp_flvr_expire[2];   /* seconds */
 
         union {
-                struct mds_export_data    eu_mds_data;
                 struct mdt_export_data    eu_mdt_data;
                 struct filter_export_data eu_filter_data;
                 struct ec_export_data     eu_ec_data;
         } u;
 };
 
-#define exp_mds_data    u.eu_mds_data
 #define exp_mdt_data    u.eu_mdt_data
-#define exp_lov_data    u.eu_lov_data
 #define exp_filter_data u.eu_filter_data
 #define exp_ec_data     u.eu_ec_data