LU-8359 ldlm: Wrong evict during failover

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

diff --git a/lustre/include/lustre_export.h b/lustre/include/lustre_export.h
index 31a1e81..7aa1dff 100644 (file)
--- a/lustre/include/lustre_export.h
+++ b/lustre/include/lustre_export.h
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -27,7 +23,7 @@
  * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2015, Intel Corporation.
+ * Copyright (c) 2011, 2016, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -84,6 +80,9 @@ struct tg_export_data {
        struct lu_nodemap       *ted_nodemap;
        struct list_head        ted_nodemap_member;
 
+       /** last version of nodemap config sent to client */
+       __u64                   ted_nodemap_version;
+
        /* Every reply data fields below are
         * protected by ted_lcd_lock */
        /** List of reply data */
@@ -95,6 +94,11 @@ struct tg_export_data {
        int                     ted_reply_max; /* high water mark */
        int                     ted_release_xid;
        int                     ted_release_tag;
+       /* grants */
+       long                    ted_dirty;    /* in bytes */
+       long                    ted_grant;    /* in bytes */
+       long                    ted_pending;  /* bytes just being written */
+       __u8                    ted_pagebits; /* log2 of client page size */
 };
 
 /**
@@ -105,8 +109,6 @@ struct mdt_export_data {
        /** List of all files opened by client on this MDT */
        struct list_head        med_open_head;
        spinlock_t              med_open_lock; /* med_open_head, mfd_list */
-       struct mutex            med_idmap_mutex;
-       struct lustre_idmap_table *med_idmap;
 };
 
 struct ec_export_data { /* echo client */
@@ -119,16 +121,12 @@ struct filter_export_data {
        struct tg_export_data   fed_ted;
        spinlock_t              fed_lock;       /**< protects fed_mod_list */
        __u64                   fed_lastid_gen;
-       long                    fed_dirty;    /* in bytes */
-       long                    fed_grant;    /* in bytes */
        struct list_head        fed_mod_list; /* files being modified */
-       long                    fed_pending;  /* bytes just being written */
        /* count of SOFT_SYNC RPCs, which will be reset after
         * ofd_soft_sync_limit number of RPCs, and trigger a sync. */
        atomic_t                fed_soft_sync_count;
        int                     fed_mod_count;/* items in fed_writing list */
        __u32                   fed_group;
-       __u8                    fed_pagebits; /* log2 of client page size */
 };
 
 struct mgs_export_data {
@@ -166,7 +164,6 @@ do {                                                                           \
 
 enum obd_option {
         OBD_OPT_FORCE =         0x0001,
-        OBD_OPT_FAILOVER =      0x0002,
         OBD_OPT_ABORT_RECOV =   0x0004,
 };
 
@@ -269,12 +266,15 @@ struct obd_export {
                                   exp_libclient:1, /* liblustre client? */
                                  /* if to swap nidtbl entries for 2.2 clients.
                                   * Only used by the MGS to fix LU-1644. */
-                                 exp_need_mne_swab:1;
+                                 exp_need_mne_swab:1,
+                                 /* The export already got final replay ping
+                                  * request. */
+                                 exp_replay_done:1;
         /* 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 */
+       time64_t                  exp_flvr_expire[2];   /* seconds */
 
         /** protects exp_hp_rpcs */
        spinlock_t              exp_rpc_lock;
@@ -350,20 +350,6 @@ static inline int exp_connect_lru_resize(struct obd_export *exp)
        return !!(exp_connect_flags(exp) & OBD_CONNECT_LRU_RESIZE);
 }
 
-static inline int exp_connect_rmtclient(struct obd_export *exp)
-{
-       LASSERT(exp != NULL);
-       return !!(exp_connect_flags(exp) & OBD_CONNECT_RMT_CLIENT);
-}
-
-static inline int client_is_remote(struct obd_export *exp)
-{
-        struct obd_import *imp = class_exp2cliimp(exp);
-
-        return !!(imp->imp_connect_data.ocd_connect_flags &
-                  OBD_CONNECT_RMT_CLIENT);
-}
-
 static inline int exp_connect_vbr(struct obd_export *exp)
 {
        LASSERT(exp != NULL);
@@ -428,6 +414,11 @@ static inline __u64 exp_connect_ibits(struct obd_export *exp)
        return ocd->ocd_ibits_known;
 }
 
+static inline int exp_connect_large_acl(struct obd_export *exp)
+{
+       return !!(exp_connect_flags(exp) & OBD_CONNECT_LARGE_ACL);
+}
+
 extern struct obd_export *class_conn2export(struct lustre_handle *conn);
 extern struct obd_device *class_conn2obd(struct lustre_handle *conn);