LU-5657 doc: allow the use of rst2man to build man pages

[fs/lustre-release.git] / lustre / mgs / mgs_internal.h

diff --git a/lustre/mgs/mgs_internal.h b/lustre/mgs/mgs_internal.h
index 6d10d5f..781cd2c 100644 (file)
--- a/lustre/mgs/mgs_internal.h
+++ b/lustre/mgs/mgs_internal.h
@@ -27,7 +27,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2013, Intel Corporation.
+ * Copyright (c) 2011, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -167,14 +167,15 @@ struct mgs_device {
        struct dt_object                *mgs_nidtbl_dir;
        struct list_head                 mgs_fs_db_list;
        spinlock_t                       mgs_lock; /* covers mgs_fs_db_list */
-       cfs_proc_dir_entry_t            *mgs_proc_live;
-       cfs_proc_dir_entry_t            *mgs_proc_osd;
-       cfs_proc_dir_entry_t            *mgs_proc_fstype;
-       cfs_proc_dir_entry_t            *mgs_proc_mntdev;
+       struct proc_dir_entry           *mgs_proc_live;
+       struct proc_dir_entry           *mgs_proc_osd;
+       struct proc_dir_entry           *mgs_proc_fstype;
+       struct proc_dir_entry           *mgs_proc_mntdev;
        cfs_time_t                       mgs_start_time;
        struct obd_device               *mgs_obd;
        struct local_oid_storage        *mgs_los;
        struct mutex                     mgs_mutex;
+       struct mutex                     mgs_health_mutex;
        struct lu_target                 mgs_lut;
 };
 
@@ -217,7 +218,7 @@ int mgs_pool_cmd(const struct lu_env *env, struct mgs_device *mgs,
                 char *ostname);
 int mgs_nodemap_cmd(const struct lu_env *env, struct mgs_device *mgs,
                    enum lcfg_command_type cmd, const char *nodemap_name,
-                   const char *param);
+                   char *param);
 
 /* mgs_handler.c */
 int  mgs_get_lock(struct obd_device *obd, struct ldlm_res_id *res,
@@ -252,7 +253,7 @@ int mgs_client_free(struct obd_export *exp);
 int mgs_fs_setup(const struct lu_env *env, struct mgs_device *m);
 int mgs_fs_cleanup(const struct lu_env *env, struct mgs_device *m);
 
-#ifdef LPROCFS
+#ifdef CONFIG_PROC_FS
 int lproc_mgs_setup(struct mgs_device *mgs, const char *osd_name);
 void lproc_mgs_cleanup(struct mgs_device *mgs);
 int lproc_mgs_add_live(struct mgs_device *mgs, struct fs_db *fsdb);