LU-1866 lfsck: general framework for LFSCK 1.5

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

diff --git a/lustre/mdd/mdd_device.c b/lustre/mdd/mdd_device.c
index 2670c1f..f87fa42 100644 (file)
--- a/lustre/mdd/mdd_device.c
+++ b/lustre/mdd/mdd_device.c
@@ -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, 2012, Whamcloud, Inc.
+ * Copyright (c) 2011, 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -167,7 +167,6 @@ static void mdd_device_shutdown(const struct lu_env *env,
                                 struct mdd_device *m, struct lustre_cfg *cfg)
 {
         ENTRY;
-        mdd_changelog_fini(env, m);
         if (m->mdd_dot_lustre_objs.mdd_obf)
                 mdd_object_put(env, m->mdd_dot_lustre_objs.mdd_obf);
         if (m->mdd_dot_lustre)
@@ -292,17 +291,10 @@ static int mdd_changelog_llog_init(const struct lu_env *env,
 {
        struct obd_device       *obd = mdd2obd_dev(mdd);
        struct llog_ctxt        *ctxt = NULL, *uctxt = NULL;
-       struct lu_fid            rfid;
        int                      rc;
 
        OBD_SET_CTXT_MAGIC(&obd->obd_lvfs_ctxt);
        obd->obd_lvfs_ctxt.dt = mdd->mdd_bottom;
-       rc = dt_root_get(env, mdd->mdd_bottom, &rfid);
-       if (rc)
-               RETURN(-ENODEV);
-
-       changelog_orig_logops = llog_osd_ops;
-       changelog_orig_logops.lop_cancel = llog_changelog_cancel;
        rc = llog_setup(env, obd, &obd->obd_olg, LLOG_CHANGELOG_ORIG_CTXT,
                        obd, &changelog_orig_logops);
        if (rc) {
@@ -319,10 +311,6 @@ static int mdd_changelog_llog_init(const struct lu_env *env,
        if (rc)
                GOTO(out_cleanup, rc);
 
-       ctxt->loc_handle->lgh_logops->lop_add = llog_cat_add_rec;
-       ctxt->loc_handle->lgh_logops->lop_declare_add =
-                                       llog_cat_declare_add_rec;
-
        rc = llog_cat_init_and_process(env, ctxt->loc_handle);
        if (rc)
                GOTO(out_close, rc);
@@ -750,12 +738,12 @@ static int dot_lustre_mdd_lookup(const struct lu_env *env, struct md_object *p,
                                  const struct lu_name *lname, struct lu_fid *f,
                                  struct md_op_spec *spec)
 {
-        if (strcmp(lname->ln_name, mdd_obf_dir_name) == 0)
-                *f = LU_OBF_FID;
-        else
-                return -ENOENT;
+       if (strcmp(lname->ln_name, mdd_obf_dir_name) == 0) {
+               *f = LU_OBF_FID;
+               return 0;
+       }
 
-        return 0;
+       return -ENOENT;
 }
 
 static mdl_mode_t dot_lustre_mdd_lock_mode(const struct lu_env *env,
@@ -884,7 +872,6 @@ static int obf_xattr_get(const struct lu_env *env,
 {
        struct mdd_device *mdd = mdo2mdd(obj);
        struct mdd_object *root;
-       struct lu_fid      rootfid;
        int rc = 0;
 
        /*
@@ -892,10 +879,7 @@ static int obf_xattr_get(const struct lu_env *env,
         * in the root
         */
        if (strcmp(name, XATTR_NAME_LOV) == 0) {
-               rc = dt_root_get(env, mdd->mdd_child, &rootfid);
-               if (rc)
-                       return rc;
-               root = mdd_object_find(env, mdd, &rootfid);
+               root = mdd_object_find(env, mdd, &mdd->mdd_local_root_fid);
                if (IS_ERR(root))
                        return PTR_ERR(root);
                rc = mdo_xattr_get(env, root, buf, name,
@@ -1090,6 +1074,7 @@ static int mdd_dot_lustre_setup(const struct lu_env *env, struct mdd_device *m)
         struct dt_object *dt_dot_lustre;
         struct lu_fid *fid = &mdd_env_info(env)->mti_fid;
         int rc;
+       ENTRY;
 
         rc = create_dot_lustre_dir(env, m);
         if (rc)
@@ -1145,6 +1130,7 @@ static int mdd_process_config(const struct lu_env *env,
                 break;
         case LCFG_CLEANUP:
                mdd_lfsck_cleanup(env, m);
+               mdd_changelog_fini(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);
@@ -1161,11 +1147,12 @@ static int mdd_recovery_complete(const struct lu_env *env,
                                  struct lu_device *d)
 {
         struct mdd_device *mdd = lu2mdd_dev(d);
-        struct lu_device *next = &mdd->mdd_child->dd_lu_dev;
+       struct lu_device *next;
         int rc;
         ENTRY;
 
         LASSERT(mdd != NULL);
+       next = &mdd->mdd_child->dd_lu_dev;
 
         /* XXX: orphans handling. */
         __mdd_orphan_cleanup(env, mdd);
@@ -1189,6 +1176,10 @@ static int mdd_prepare(const struct lu_env *env,
         if (rc)
                 GOTO(out, rc);
 
+       rc = dt_root_get(env, mdd->mdd_child, &mdd->mdd_local_root_fid);
+       if (rc != 0)
+               GOTO(out, rc);
+
         root = dt_store_open(env, mdd->mdd_child, "", mdd_root_dir_name,
                              &mdd->mdd_root_fid);
         if (!IS_ERR(root)) {
@@ -1215,13 +1206,14 @@ static int mdd_prepare(const struct lu_env *env,
 
        mdd->mdd_capa = root;
 
+       rc = mdd_changelog_init(env, mdd);
+       if (rc != 0)
+               GOTO(out, rc);
+
        rc = mdd_lfsck_setup(env, mdd);
-       if (rc) {
+       if (rc != 0)
                CERROR("%s: failed to initialize lfsck: rc = %d\n",
                       mdd2obd_dev(mdd)->obd_name, rc);
-               GOTO(out, rc);
-       }
-       rc = mdd_changelog_init(env, mdd);
 
        GOTO(out, rc);
 
@@ -1637,17 +1629,16 @@ static int mdd_iocontrol(const struct lu_env *env, struct md_device *m,
                 RETURN(0);
         }
        case OBD_IOC_START_LFSCK: {
-               struct lfsck_start *start = karg;
-               struct md_lfsck *lfsck = &mdd->mdd_lfsck;
-
-               /* Return the kernel service version. */
-               /* XXX: version can be used for compatibility in the future. */
-               start->ls_version = lfsck->ml_version;
-               rc = mdd_lfsck_start(env, lfsck, start);
+               rc = mdd_lfsck_start(env, &mdd->mdd_lfsck,
+                                    (struct lfsck_start *)karg);
                RETURN(rc);
        }
        case OBD_IOC_STOP_LFSCK: {
-               rc = mdd_lfsck_stop(env, &mdd->mdd_lfsck);
+               rc = mdd_lfsck_stop(env, &mdd->mdd_lfsck, false);
+               RETURN(rc);
+       }
+       case OBD_IOC_PAUSE_LFSCK: {
+               rc = mdd_lfsck_stop(env, &mdd->mdd_lfsck, true);
                RETURN(rc);
        }
         }
@@ -1766,6 +1757,11 @@ static int __init mdd_mod_init(void)
        if (rc)
                return rc;
 
+       changelog_orig_logops = llog_osd_ops;
+       changelog_orig_logops.lop_cancel = llog_changelog_cancel;
+       changelog_orig_logops.lop_add = llog_cat_add_rec;
+       changelog_orig_logops.lop_declare_add = llog_cat_declare_add_rec;
+
        llo_local_obj_register(&llod_capa_key);
        llo_local_obj_register(&llod_mdd_orphan);
        llo_local_obj_register(&llod_mdd_root);