LU-5092 nodemap: remove nodemap_idx_action, only act on MGS

[fs/lustre-release.git] / lustre / mgs / mgs_fs.c

diff --git a/lustre/mgs/mgs_fs.c b/lustre/mgs/mgs_fs.c
index a3ce58f..338858e 100644 (file)
--- a/lustre/mgs/mgs_fs.c
+++ b/lustre/mgs/mgs_fs.c
@@ -163,6 +163,7 @@ int mgs_fs_setup(const struct lu_env *env, struct mgs_device *mgs)
 
        mgs->mgs_configs_dir = o;
 
+       /* colocated MDT will cache config in target / dir */
        nm_config_file_obj = local_index_find_or_create(env, mgs->mgs_los,
                                                        mgs->mgs_configs_dir,
                                                        LUSTRE_NODEMAP_NAME,
@@ -181,7 +182,8 @@ int mgs_fs_setup(const struct lu_env *env, struct mgs_device *mgs)
                        GOTO(out_configs, rc);
                }
        }
-       nm_config_file = nm_config_file_register(env, nm_config_file_obj);
+       nm_config_file = nm_config_file_register(env, nm_config_file_obj,
+                                                mgs->mgs_los, NCFT_MGS);
        if (IS_ERR(nm_config_file)) {
                lu_object_put(env, &nm_config_file_obj->do_lu);
                CERROR("%s: error loading nodemap config file, file must be "
@@ -201,7 +203,7 @@ int mgs_fs_setup(const struct lu_env *env, struct mgs_device *mgs)
 
 out_nm:
        if (rc < 0) {
-               nm_config_file_deregister(env, nm_config_file);
+               nm_config_file_deregister(env, nm_config_file, NCFT_MGS);
                mgs->mgs_obd->u.obt.obt_nodemap_config_file = NULL;
        }
 out_configs:
@@ -234,7 +236,8 @@ int mgs_fs_cleanup(const struct lu_env *env, struct mgs_device *mgs)
        }
        if (mgs->mgs_obd->u.obt.obt_nodemap_config_file != NULL) {
                nm_config_file_deregister(env,
-                               mgs->mgs_obd->u.obt.obt_nodemap_config_file);
+                               mgs->mgs_obd->u.obt.obt_nodemap_config_file,
+                               NCFT_MGS);
                mgs->mgs_obd->u.obt.obt_nodemap_config_file = NULL;
        }