X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_export.h;h=74463218daf830d6cc29b29f3aa0eccb369d04aa;hb=22a1b359cb17a8e812bbda8d344f808369740f2e;hp=39df979f793e05bb4f88971c2db5cc98ce600ab7;hpb=23e251073dfcca0f446bac9b0760118ba17cccf5;p=fs%2Flustre-release.git

diff --git a/lustre/include/lustre_export.h b/lustre/include/lustre_export.h
index 39df979..7446321 100644
--- a/lustre/include/lustre_export.h
+++ b/lustre/include/lustre_export.h
@@ -11,6 +11,9 @@
 
 /* Data stored per client in the last_rcvd file.  In le32 order. */
 struct mds_client_data;
+struct mdt_client_data;
+struct mds_idmap_table;
+struct mdt_idmap_table;
 
 struct mds_export_data {
         struct list_head        med_open_head;
@@ -19,6 +22,22 @@ struct mds_export_data {
         __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;
+        __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 osc_creator {
@@ -34,7 +53,7 @@ struct osc_creator {
 };
 
 struct ldlm_export_data {
-        struct list_head       led_held_locks; /* protected by led_lock below */
+        struct list_head       led_held_locks; /* protected by led_lock */
         spinlock_t             led_lock;
 };
 
@@ -54,9 +73,21 @@ struct filter_export_data {
         struct list_head           fed_mod_list; /* files being modified */
         int                        fed_mod_count;/* items in fed_writing list */
         long                       fed_pending;  /* bytes just being written */
+        __u32                      fed_group;
         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;
@@ -69,8 +100,8 @@ 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;
         __u32                     exp_conn_cnt;
@@ -81,24 +112,57 @@ struct obd_export {
         /* ^ protects exp_outstanding_replies too */
         __u64                     exp_connect_flags;
         int                       exp_flags;
-        unsigned int              exp_failed:1,
+        unsigned long             exp_failed:1,
+                                  exp_in_recovery:1,
                                   exp_disconnected:1,
                                   exp_connecting:1,
-                                  exp_replay_needed:1,
-                                  exp_need_sync:1, /* needs sync from connect */
+                                  exp_req_replay_needed:1,
+                                  exp_lock_replay_needed:1,
+                                  exp_need_sync:1,
+                                  exp_flvr_changed:1,
+                                  exp_flvr_adapt:1,
                                   exp_libclient:1; /* liblustre client? */
+        /* also protected by exp_lock */
+        enum lustre_sec_part      exp_sp_peer;
+        struct sptlrpc_flavor     exp_flvr;             /* current */
+        struct sptlrpc_flavor     exp_flvr_old[2];      /* about-to-expire */
+        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
 
+static inline int exp_connect_cancelset(struct obd_export *exp)
+{
+        LASSERT(exp != NULL);
+        return !!(exp->exp_connect_flags & OBD_CONNECT_CANCELSET);
+}
+
+static inline int exp_connect_lru_resize(struct obd_export *exp)
+{
+        LASSERT(exp != NULL);
+        return !!(exp->exp_connect_flags & OBD_CONNECT_LRU_RESIZE);
+}
+
+static inline int imp_connect_lru_resize(struct obd_import *imp)
+{
+        struct obd_connect_data *ocd;
+
+        LASSERT(imp != NULL);
+        ocd = &imp->imp_connect_data;
+        return !!(ocd->ocd_connect_flags & OBD_CONNECT_LRU_RESIZE);
+}
+
 extern struct obd_export *class_conn2export(struct lustre_handle *conn);
 extern struct obd_device *class_conn2obd(struct lustre_handle *conn);