LU-2213 scrub: stop LFSCK before osd_shutdown

[fs/lustre-release.git] / lustre / mdd / mdd_device.c

diff --git a/lustre/mdd/mdd_device.c b/lustre/mdd/mdd_device.c
index af403b0..e6f0213 100644 (file)
--- a/lustre/mdd/mdd_device.c
+++ b/lustre/mdd/mdd_device.c
@@ -167,7 +167,6 @@ static void mdd_device_shutdown(const struct lu_env *env,
                                 struct mdd_device *m, struct lustre_cfg *cfg)
 {
         ENTRY;
-       mdd_lfsck_cleanup(env, m);
         mdd_changelog_fini(env, m);
         if (m->mdd_dot_lustre_objs.mdd_obf)
                 mdd_object_put(env, m->mdd_dot_lustre_objs.mdd_obf);
@@ -364,7 +363,7 @@ static int mdd_changelog_llog_init(const struct lu_env *env,
        if (rc)
                GOTO(out_uclose, rc);
 
-       rc = llog_cat_reverse_process(env, ctxt->loc_handle,
+       rc = llog_cat_reverse_process(env, uctxt->loc_handle,
                                      changelog_user_init_cb, mdd);
        if (rc < 0) {
                CERROR("%s: changelog user init failed: rc = %d\n",
@@ -1136,6 +1135,7 @@ static int mdd_process_config(const struct lu_env *env,
                 dt->dd_ops->dt_conf_get(env, dt, &m->mdd_dt_conf);
                 break;
         case LCFG_CLEANUP:
+               mdd_lfsck_cleanup(env, m);
                rc = next->ld_ops->ldo_process_config(env, next, cfg);
                lu_dev_del_linkage(d->ld_site, d);
                 mdd_device_shutdown(env, m, cfg);