b=13766

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

diff --git a/lustre/include/lustre_export.h b/lustre/include/lustre_export.h
index a405fae..7e4c8b9 100644 (file)
--- a/lustre/include/lustre_export.h
+++ b/lustre/include/lustre_export.h
@@ -23,9 +23,8 @@ struct mds_export_data {
         loff_t                  med_lr_off;
         int                     med_lr_idx;
         unsigned int            med_rmtclient:1; /* remote client? */
-        __u32                   med_nllu;
-        __u32                   med_nllg;
-        struct mds_idmap_table *med_idmap;
+        struct semaphore           med_idmap_sem;
+        struct lustre_idmap_table *med_idmap;
 };
 
 struct mdt_export_data {
@@ -37,9 +36,8 @@ struct mdt_export_data {
         loff_t                  med_lr_off;
         int                     med_lr_idx;
         unsigned int            med_rmtclient:1; /* remote client? */
-        __u32                   med_nllu;
-        __u32                   med_nllg;
-        struct mdt_idmap_table *med_idmap;
+        struct semaphore           med_idmap_sem;
+        struct lustre_idmap_table *med_idmap;
 };
 
 struct osc_creator {
@@ -85,6 +83,8 @@ struct obd_export {
         atomic_t                  exp_rpc_count;
         struct obd_uuid           exp_client_uuid;
         struct list_head          exp_obd_chain;
+        struct hlist_node         exp_uuid_hash; /* uuid-export hash*/
+        struct hlist_node         exp_nid_hash; /* nid-export hash */
         /* exp_obd_chain_timed fo ping evictor, protected by obd_dev_lock */
         struct list_head          exp_obd_chain_timed;
         struct obd_device        *exp_obd;
@@ -102,14 +102,22 @@ 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_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;
@@ -124,6 +132,27 @@ struct obd_export {
 #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);