- renamed lmv_mgr_*() to lmv_obj_*() to be coherent with another obj methods.

diff --git a/lustre/lmv/lmv_internal.h b/lustre/lmv/lmv_internal.h
index aed7496..6c4aa16 100644 (file)
--- a/lustre/lmv/lmv_internal.h
+++ b/lustre/lmv/lmv_internal.h
@@ -63,8 +63,8 @@ struct lmv_obj {
         struct obd_device *lo_obd;        /* pointer to LMV itself */
 };
 
-int lmv_mgr_setup(struct obd_device *obd);
-void lmv_mgr_cleanup(struct obd_device *obd);
+int lmv_obj_setup(struct obd_device *obd);
+void lmv_obj_cleanup(struct obd_device *obd);
 
 static inline void
 lmv_obj_lock(struct lmv_obj *obj)

diff --git a/lustre/lmv/lmv_obd.c b/lustre/lmv/lmv_obd.c
index 62bc94c..3738eba 100644 (file)
--- a/lustre/lmv/lmv_obd.c
+++ b/lustre/lmv/lmv_obd.c
@@ -838,7 +838,7 @@ static int lmv_setup(struct obd_device *obd, struct lustre_cfg *lcfg)
         spin_lock_init(&lmv->lmv_lock);
         sema_init(&lmv->init_sem, 1);
 
-        rc = lmv_mgr_setup(obd);
+        rc = lmv_obj_setup(obd);
         if (rc) {
                 CERROR("Can't setup LMV object manager, "
                        "error %d.\n", rc);
@@ -885,7 +885,7 @@ static int lmv_cleanup(struct obd_device *obd)
 
         fld_client_fini(&lmv->lmv_fld);
         lprocfs_obd_cleanup(obd);
-        lmv_mgr_cleanup(obd);
+        lmv_obj_cleanup(obd);
         OBD_FREE(lmv->datas, lmv->datas_size);
         OBD_FREE(lmv->tgts, lmv->tgts_size);
 

diff --git a/lustre/lmv/lmv_object.c b/lustre/lmv/lmv_object.c
index 93d8709..ab48f9f 100644 (file)
--- a/lustre/lmv/lmv_object.c
+++ b/lustre/lmv/lmv_object.c
@@ -375,7 +375,7 @@ lmv_obj_delete(struct obd_export *exp, const struct lu_fid *fid)
 }
 
 int
-lmv_mgr_setup(struct obd_device *obd)
+lmv_obj_setup(struct obd_device *obd)
 {
         ENTRY;
         LASSERT(obd != NULL);
@@ -387,7 +387,7 @@ lmv_mgr_setup(struct obd_device *obd)
 }
 
 void
-lmv_mgr_cleanup(struct obd_device *obd)
+lmv_obj_cleanup(struct obd_device *obd)
 {
         struct list_head *cur, *tmp;
         struct lmv_obj *obj;