LU-3540 lod: update recovery thread

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

diff --git a/lustre/mgs/mgs_internal.h b/lustre/mgs/mgs_internal.h
index 7118ab6..bf38873 100644 (file)
--- a/lustre/mgs/mgs_internal.h
+++ b/lustre/mgs/mgs_internal.h
@@ -175,6 +175,7 @@ struct mgs_device {
        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;
 };
 
@@ -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);
@@ -369,11 +370,6 @@ static inline struct dt_object* mgs_object_child(struct mgs_object *o)
                             struct dt_object, do_lu);
 }
 
-static inline struct dt_object *dt_object_child(struct dt_object *o)
-{
-       return container_of0(lu_object_next(&(o)->do_lu),
-                            struct dt_object, do_lu);
-}
 struct mgs_direntry {
        struct list_head         mde_list;
        char                    *mde_name;