X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmgc%2Fmgc_internal.h;h=8429a3276262c1bf42aea37c92e17f25e367357a;hb=e34950d29f1168a8a85f26e862eaec888b94350e;hp=06220ebdd463823d769f62b31d8429fbb080330d;hpb=e3a7c58aebafce40323db54bf6056029e5af4a70;p=fs%2Flustre-release.git

diff --git a/lustre/mgc/mgc_internal.h b/lustre/mgc/mgc_internal.h
index 06220eb..8429a32 100644
--- a/lustre/mgc/mgc_internal.h
+++ b/lustre/mgc/mgc_internal.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,49 +23,60 @@
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, Whamcloud, Inc.
+ * Copyright (c) 2011, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  */
 
 #ifndef _MGC_INTERNAL_H
 #define _MGC_INTERNAL_H
 
 #include <libcfs/libcfs.h>
-#include <lustre/lustre_idl.h>
 #include <lustre_lib.h>
 #include <lustre_dlm.h>
 #include <lustre_log.h>
 #include <lustre_export.h>
 
-#ifdef LPROCFS
-void lprocfs_mgc_init_vars(struct lprocfs_static_vars *lvars);
-int lprocfs_mgc_rd_ir_state(char *page, char **start, off_t off,
-                            int count, int *eof, void *data);
-#else
-static void lprocfs_mgc_init_vars(struct lprocfs_static_vars *lvars)
+int mgc_tunables_init(struct obd_device *obd);
+int lprocfs_mgc_rd_ir_state(struct seq_file *m, void *data);
+
+int mgc_process_log(struct obd_device *mgc, struct config_llog_data *cld);
+
+/* this timeout represents how many seconds MGC should wait before
+ * requeue config and recover lock to the MGS. We need to randomize this
+ * in order to not flood the MGS.
+ */
+#define MGC_TIMEOUT_MIN_SECONDS		5
+
+extern unsigned int mgc_requeue_timeout_min;
+
+static inline bool cld_is_sptlrpc(struct config_llog_data *cld)
 {
-        memset(lvars, 0, sizeof(*lvars));
+	return cld->cld_type == MGS_CFG_T_SPTLRPC;
 }
-static inline int lprocfs_mgc_rd_ir_state(char *page, char **start,
-        off_t off, int count, int *eof, void *data)
+
+static inline bool cld_is_recover(struct config_llog_data *cld)
 {
-        return 0;
+	return cld->cld_type == MGS_CFG_T_RECOVER;
 }
-#endif  /* LPROCFS */
-
-int mgc_process_log(struct obd_device *mgc, struct config_llog_data *cld);
 
-static inline int cld_is_sptlrpc(struct config_llog_data *cld)
+static inline bool cld_is_nodemap(struct config_llog_data *cld)
 {
-        return cld->cld_type == CONFIG_T_SPTLRPC;
+#ifdef HAVE_SERVER_SUPPORT
+	return cld->cld_type == MGS_CFG_T_NODEMAP;
+#else
+	return false;
+#endif
 }
 
-static inline int cld_is_recover(struct config_llog_data *cld)
+static inline bool cld_is_barrier(struct config_llog_data *cld)
 {
-        return cld->cld_type == CONFIG_T_RECOVER;
+#ifdef HAVE_SERVER_SUPPORT
+	return cld->cld_type == MGS_CFG_T_BARRIER;
+#else
+	return false;
+#endif
 }
 
 #endif  /* _MGC_INTERNAL_H */