Whamcloud - gitweb
LU-15886 lfsck: remove unreasonable assertions
[fs/lustre-release.git] / lustre / lfsck / lfsck_lib.c
index b7bb529..7e36a18 100644 (file)
@@ -20,7 +20,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2013, 2015, Intel Corporation.
+ * Copyright (c) 2013, 2017, Intel Corporation.
  */
 /*
  * lustre/lfsck/lfsck_lib.c
@@ -31,7 +31,9 @@
 #define DEBUG_SUBSYSTEM S_LFSCK
 
 #include <linux/kthread.h>
-#include <libcfs/list.h>
+#include <linux/sched.h>
+#include <linux/list.h>
+#include <linux/delay.h>
 #include <lu_object.h>
 #include <dt_object.h>
 #include <md_object.h>
@@ -39,7 +41,6 @@
 #include <lustre_lib.h>
 #include <lustre_net.h>
 #include <lustre_lfsck.h>
-#include <lustre/lustre_lfsck_user.h>
 
 #include "lfsck_internal.h"
 
@@ -62,27 +63,12 @@ static void lfsck_key_fini(const struct lu_context *ctx,
 LU_CONTEXT_KEY_DEFINE(lfsck, LCT_MD_THREAD | LCT_DT_THREAD);
 LU_KEY_INIT_GENERIC(lfsck);
 
-static struct list_head lfsck_instance_list;
-static struct list_head lfsck_ost_orphan_list;
-static struct list_head lfsck_mdt_orphan_list;
+static LIST_HEAD(lfsck_instance_list);
+static LIST_HEAD(lfsck_ost_orphan_list);
+static LIST_HEAD(lfsck_mdt_orphan_list);
 static DEFINE_SPINLOCK(lfsck_instance_lock);
 
-static const char *lfsck_status_names[] = {
-       [LS_INIT]               = "init",
-       [LS_SCANNING_PHASE1]    = "scanning-phase1",
-       [LS_SCANNING_PHASE2]    = "scanning-phase2",
-       [LS_COMPLETED]          = "completed",
-       [LS_FAILED]             = "failed",
-       [LS_STOPPED]            = "stopped",
-       [LS_PAUSED]             = "paused",
-       [LS_CRASHED]            = "crashed",
-       [LS_PARTIAL]            = "partial",
-       [LS_CO_FAILED]          = "co-failed",
-       [LS_CO_STOPPED]         = "co-stopped",
-       [LS_CO_PAUSED]          = "co-paused"
-};
-
-const char *lfsck_flags_names[] = {
+const char *const lfsck_flags_names[] = {
        "scanned-once",
        "inconsistent",
        "upgrade",
@@ -91,7 +77,7 @@ const char *lfsck_flags_names[] = {
        NULL
 };
 
-const char *lfsck_param_names[] = {
+const char *const lfsck_param_names[] = {
        NULL,
        "failout",
        "dryrun",
@@ -100,6 +86,8 @@ const char *lfsck_param_names[] = {
        "orphan",
        "create_ostobj",
        "create_mdtobj",
+       NULL,
+       "delay_create_ostobj",
        NULL
 };
 
@@ -108,12 +96,16 @@ enum lfsck_verify_lpf_types {
        LVLT_BY_NAMEENTRY       = 1,
 };
 
-const char *lfsck_status2names(enum lfsck_status status)
+static inline void
+lfsck_reset_ltd_status(struct lfsck_tgt_desc *ltd, enum lfsck_type type)
 {
-       if (unlikely(status < 0 || status >= LS_MAX))
-               return "unknown";
-
-       return lfsck_status_names[status];
+       if (type == LFSCK_TYPE_LAYOUT) {
+               ltd->ltd_layout_status = LS_MAX;
+               ltd->ltd_layout_repaired = 0;
+       } else {
+               ltd->ltd_namespace_status = LS_MAX;
+               ltd->ltd_namespace_repaired = 0;
+       }
 }
 
 static int lfsck_tgt_descs_init(struct lfsck_tgt_descs *ltds)
@@ -166,7 +158,7 @@ static void lfsck_tgt_descs_fini(struct lfsck_tgt_descs *ltds)
        LASSERTF(ltds->ltd_tgtnr == 0, "tgt count unmatched: %d\n",
                 ltds->ltd_tgtnr);
 
-       for (idx = 0; idx < TGT_PTRS; idx++) {
+       for (idx = 0; idx < ARRAY_SIZE(ltds->ltd_tgts_idx); idx++) {
                if (ltds->ltd_tgts_idx[idx] != NULL) {
                        OBD_FREE_PTR(ltds->ltd_tgts_idx[idx]);
                        ltds->ltd_tgts_idx[idx] = NULL;
@@ -201,8 +193,8 @@ static int __lfsck_add_target(const struct lu_env *env,
        if (index >= ltds->ltd_tgts_bitmap->size) {
                __u32 newsize = max((__u32)ltds->ltd_tgts_bitmap->size,
                                    (__u32)BITS_PER_LONG);
-               cfs_bitmap_t *old_bitmap = ltds->ltd_tgts_bitmap;
-               cfs_bitmap_t *new_bitmap;
+               struct cfs_bitmap *old_bitmap = ltds->ltd_tgts_bitmap;
+               struct cfs_bitmap *new_bitmap;
 
                while (newsize < index + 1)
                        newsize <<= 1;
@@ -386,10 +378,17 @@ static int __lfsck_ibits_lock(const struct lu_env *env,
                einfo->ei_cb_bl = ldlm_blocking_ast;
                einfo->ei_cb_cp = ldlm_completion_ast;
                einfo->ei_res_id = resid;
+               einfo->ei_req_slot = 1;
 
                rc = dt_object_lock(env, obj, lh, einfo, policy);
+               /* for regular checks LFSCK doesn't use LDLM locking,
+                * so the state isn't coherent. here we just took LDLM
+                * lock for coherency and it's time to invalidate
+                * previous state */
+               if (rc == ELDLM_OK)
+                       dt_invalidate(env, obj);
        } else {
-               rc = ldlm_cli_enqueue_local(lfsck->li_namespace, resid,
+               rc = ldlm_cli_enqueue_local(env, lfsck->li_namespace, resid,
                                            LDLM_IBITS, policy, mode,
                                            &flags, ldlm_blocking_ast,
                                            ldlm_completion_ast, NULL, NULL,
@@ -435,6 +434,36 @@ int lfsck_ibits_lock(const struct lu_env *env, struct lfsck_instance *lfsck,
 }
 
 /**
+ * Request the remote LOOKUP lock for the given object.
+ *
+ * If \a pobj is remote, the LOOKUP lock of \a obj is on the MDT where
+ * \a pobj is, acquire LOOKUP lock there.
+ *
+ * \param[in] env      pointer to the thread context
+ * \param[in] lfsck    pointer to the lfsck instance
+ * \param[in] pobj     pointer to parent dt_object
+ * \param[in] obj      pointer to the dt_object to be locked
+ * \param[out] lh      pointer to the lock handle
+ * \param[in] mode     the mode for the ldlm lock to be acquired
+ *
+ * \retval             0 for success
+ * \retval             negative error number on failure
+ */
+int lfsck_remote_lookup_lock(const struct lu_env *env,
+                            struct lfsck_instance *lfsck,
+                            struct dt_object *pobj, struct dt_object *obj,
+                            struct lustre_handle *lh, enum ldlm_mode mode)
+{
+       struct ldlm_res_id *resid = &lfsck_env_info(env)->lti_resid;
+
+       LASSERT(!lustre_handle_is_used(lh));
+
+       fid_build_reg_res_name(lfsck_dto2fid(obj), resid);
+       return __lfsck_ibits_lock(env, lfsck, pobj, resid, lh,
+                                 MDS_INODELOCK_LOOKUP, mode);
+}
+
+/**
  * Release the the specified ibits lock.
  *
  * If the lock has been acquired before, release it
@@ -512,7 +541,8 @@ int lfsck_lock(const struct lu_env *env, struct lfsck_instance *lfsck,
                return rc;
 
        llh->llh_reg_mode = mode;
-       resid->name[LUSTRE_RES_ID_HSH_OFF] = full_name_hash(name, strlen(name));
+       resid->name[LUSTRE_RES_ID_HSH_OFF] = ll_full_name_hash(NULL, name,
+                                                              strlen(name));
        LASSERT(resid->name[LUSTRE_RES_ID_HSH_OFF] != 0);
        rc = __lfsck_ibits_lock(env, lfsck, obj, resid, &llh->llh_reg_lh,
                                bits, llh->llh_reg_mode);
@@ -541,6 +571,14 @@ int lfsck_find_mdt_idx_by_fid(const struct lu_env *env,
        struct lu_seq_range     *range  = &lfsck_env_info(env)->lti_range;
        int                      rc;
 
+       if (unlikely(fid_seq(fid) == FID_SEQ_LOCAL_FILE)) {
+               /* "ROOT" is always on the MDT0. */
+               if (lu_fid_eq(fid, &lfsck->li_global_root_fid))
+                       return 0;
+
+               return lfsck_dev_idx(lfsck);
+       }
+
        fld_range_set_mdt(range);
        rc = fld_server_lookup(env, ss->ss_server_fld, fid_seq(fid), range);
        if (rc == 0)
@@ -584,7 +622,7 @@ static int lfsck_lpf_remove_name_entry(const struct lu_env *env,
        if (rc != 0)
                RETURN(rc);
 
-       th = dt_trans_create(env, dev);
+       th = lfsck_trans_create(env, dev, lfsck);
        if (IS_ERR(th))
                GOTO(unlock, rc = PTR_ERR(th));
 
@@ -644,17 +682,13 @@ static int lfsck_create_lpf_local(const struct lu_env *env,
        int                      rc;
        ENTRY;
 
-       rc = linkea_data_new(&ldata,
-                            &lfsck_env_info(env)->lti_linkea_buf2);
-       if (rc != 0)
-               RETURN(rc);
-
        cname = lfsck_name_get_const(env, name, strlen(name));
-       rc = linkea_add_buf(&ldata, cname, lfsck_dto2fid(parent));
+       rc = linkea_links_new(&ldata, &lfsck_env_info(env)->lti_linkea_buf2,
+                             cname, lfsck_dto2fid(parent));
        if (rc != 0)
                RETURN(rc);
 
-       th = dt_trans_create(env, dev);
+       th = lfsck_trans_create(env, dev, lfsck);
        if (IS_ERR(th))
                RETURN(PTR_ERR(th));
 
@@ -663,12 +697,30 @@ static int lfsck_create_lpf_local(const struct lu_env *env,
        if (rc != 0)
                GOTO(stop, rc);
 
+       if (!dt_try_as_dir(env, child))
+               GOTO(stop, rc = -ENOTDIR);
+
        /* 2a. increase child nlink */
        rc = dt_declare_ref_add(env, child, th);
        if (rc != 0)
                GOTO(stop, rc);
 
-       /* 3a. insert linkEA for child */
+       /* 3a. insert dot into child dir */
+       rec->rec_type = S_IFDIR;
+       rec->rec_fid = cfid;
+       rc = dt_declare_insert(env, child, (const struct dt_rec *)rec,
+                              (const struct dt_key *)dot, th);
+       if (rc != 0)
+               GOTO(stop, rc);
+
+       /* 4a. insert dotdot into child dir */
+       rec->rec_fid = &LU_LPF_FID;
+       rc = dt_declare_insert(env, child, (const struct dt_rec *)rec,
+                              (const struct dt_key *)dotdot, th);
+       if (rc != 0)
+               GOTO(stop, rc);
+
+       /* 5a. insert linkEA for child */
        lfsck_buf_init(&linkea_buf, ldata.ld_buf->lb_buf,
                       ldata.ld_leh->leh_len);
        rc = dt_declare_xattr_set(env, child, &linkea_buf,
@@ -676,7 +728,7 @@ static int lfsck_create_lpf_local(const struct lu_env *env,
        if (rc != 0)
                GOTO(stop, rc);
 
-       /* 4a. insert name into parent dir */
+       /* 6a. insert name into parent dir */
        rec->rec_type = S_IFDIR;
        rec->rec_fid = cfid;
        rc = dt_declare_insert(env, parent, (const struct dt_rec *)rec,
@@ -684,12 +736,12 @@ static int lfsck_create_lpf_local(const struct lu_env *env,
        if (rc != 0)
                GOTO(stop, rc);
 
-       /* 5a. increase parent nlink */
+       /* 7a. increase parent nlink */
        rc = dt_declare_ref_add(env, parent, th);
        if (rc != 0)
                GOTO(stop, rc);
 
-       /* 6a. update bookmark */
+       /* 8a. update bookmark */
        rc = dt_declare_record_write(env, bk_obj,
                                     lfsck_buf_get(env, bk, len), 0, th);
        if (rc != 0)
@@ -700,49 +752,46 @@ static int lfsck_create_lpf_local(const struct lu_env *env,
                GOTO(stop, rc);
 
        dt_write_lock(env, child, 0);
-       /* 1b.1. create child */
+       /* 1b. create child */
        rc = dt_create(env, child, la, NULL, dof, th);
        if (rc != 0)
                GOTO(unlock, rc);
 
-       if (unlikely(!dt_try_as_dir(env, child)))
-               GOTO(unlock, rc = -ENOTDIR);
+       /* 2b. increase child nlink */
+       rc = dt_ref_add(env, child, th);
+       if (rc != 0)
+               GOTO(unlock, rc);
 
-       /* 1b.2. insert dot into child dir */
+       /* 3b. insert dot into child dir */
        rec->rec_fid = cfid;
        rc = dt_insert(env, child, (const struct dt_rec *)rec,
-                      (const struct dt_key *)dot, th, 1);
+                      (const struct dt_key *)dot, th);
        if (rc != 0)
                GOTO(unlock, rc);
 
-       /* 1b.3. insert dotdot into child dir */
+       /* 4b. insert dotdot into child dir */
        rec->rec_fid = &LU_LPF_FID;
        rc = dt_insert(env, child, (const struct dt_rec *)rec,
-                      (const struct dt_key *)dotdot, th, 1);
+                      (const struct dt_key *)dotdot, th);
        if (rc != 0)
                GOTO(unlock, rc);
 
-       /* 2b. increase child nlink */
-       rc = dt_ref_add(env, child, th);
-       if (rc != 0)
-               GOTO(unlock, rc);
-
-       /* 3b. insert linkEA for child. */
+       /* 5b. insert linkEA for child. */
        rc = dt_xattr_set(env, child, &linkea_buf,
                          XATTR_NAME_LINK, 0, th);
        dt_write_unlock(env, child);
        if (rc != 0)
                GOTO(stop, rc);
 
-       /* 4b. insert name into parent dir */
+       /* 6b. insert name into parent dir */
        rec->rec_fid = cfid;
        rc = dt_insert(env, parent, (const struct dt_rec *)rec,
-                      (const struct dt_key *)name, th, 1);
+                      (const struct dt_key *)name, th);
        if (rc != 0)
                GOTO(stop, rc);
 
        dt_write_lock(env, parent, 0);
-       /* 5b. increase parent nlink */
+       /* 7b. increase parent nlink */
        rc = dt_ref_add(env, parent, th);
        dt_write_unlock(env, parent);
        if (rc != 0)
@@ -751,7 +800,7 @@ static int lfsck_create_lpf_local(const struct lu_env *env,
        bk->lb_lpf_fid = *cfid;
        lfsck_bookmark_cpu_to_le(&lfsck->li_bookmark_disk, bk);
 
-       /* 6b. update bookmark */
+       /* 8b. update bookmark */
        rc = dt_record_write(env, bk_obj,
                             lfsck_buf_get(env, bk, len), &pos, th);
 
@@ -788,13 +837,9 @@ static int lfsck_create_lpf_remote(const struct lu_env *env,
        int                      rc;
        ENTRY;
 
-       rc = linkea_data_new(&ldata,
-                            &lfsck_env_info(env)->lti_linkea_buf2);
-       if (rc != 0)
-               RETURN(rc);
-
        cname = lfsck_name_get_const(env, name, strlen(name));
-       rc = linkea_add_buf(&ldata, cname, lfsck_dto2fid(parent));
+       rc = linkea_links_new(&ldata, &lfsck_env_info(env)->lti_linkea_buf2,
+                             cname, lfsck_dto2fid(parent));
        if (rc != 0)
                RETURN(rc);
 
@@ -821,7 +866,7 @@ static int lfsck_create_lpf_remote(const struct lu_env *env,
        /* Transaction I: locally */
 
        dev = lfsck_obj2dev(child);
-       th = dt_trans_create(env, dev);
+       th = lfsck_trans_create(env, dev, lfsck);
        if (IS_ERR(th))
                RETURN(PTR_ERR(th));
 
@@ -830,12 +875,30 @@ static int lfsck_create_lpf_remote(const struct lu_env *env,
        if (rc != 0)
                GOTO(stop, rc);
 
+       if (!dt_try_as_dir(env, child))
+               GOTO(stop, rc = -ENOTDIR);
+
        /* 2a. increase child nlink */
        rc = dt_declare_ref_add(env, child, th);
        if (rc != 0)
                GOTO(stop, rc);
 
-       /* 3a. insert linkEA for child */
+       /* 3a. insert dot into child dir */
+       rec->rec_type = S_IFDIR;
+       rec->rec_fid = cfid;
+       rc = dt_declare_insert(env, child, (const struct dt_rec *)rec,
+                              (const struct dt_key *)dot, th);
+       if (rc != 0)
+               GOTO(stop, rc);
+
+       /* 4a. insert dotdot into child dir */
+       rec->rec_fid = &LU_LPF_FID;
+       rc = dt_declare_insert(env, child, (const struct dt_rec *)rec,
+                              (const struct dt_key *)dotdot, th);
+       if (rc != 0)
+               GOTO(stop, rc);
+
+       /* 5a. insert linkEA for child */
        lfsck_buf_init(&linkea_buf, ldata.ld_buf->lb_buf,
                       ldata.ld_leh->leh_len);
        rc = dt_declare_xattr_set(env, child, &linkea_buf,
@@ -843,7 +906,7 @@ static int lfsck_create_lpf_remote(const struct lu_env *env,
        if (rc != 0)
                GOTO(stop, rc);
 
-       /* 4a. update bookmark */
+       /* 6a. update bookmark */
        rc = dt_declare_record_write(env, bk_obj,
                                     lfsck_buf_get(env, bk, len), 0, th);
        if (rc != 0)
@@ -854,35 +917,32 @@ static int lfsck_create_lpf_remote(const struct lu_env *env,
                GOTO(stop, rc);
 
        dt_write_lock(env, child, 0);
-       /* 1b.1. create child */
+       /* 1b. create child */
        rc = dt_create(env, child, la, NULL, dof, th);
        if (rc != 0)
                GOTO(unlock, rc);
 
-       if (unlikely(!dt_try_as_dir(env, child)))
-               GOTO(unlock, rc = -ENOTDIR);
+       /* 2b. increase child nlink */
+       rc = dt_ref_add(env, child, th);
+       if (rc != 0)
+               GOTO(unlock, rc);
 
-       /* 1b.2. insert dot into child dir */
+       /* 3b. insert dot into child dir */
        rec->rec_type = S_IFDIR;
        rec->rec_fid = cfid;
        rc = dt_insert(env, child, (const struct dt_rec *)rec,
-                      (const struct dt_key *)dot, th, 1);
+                      (const struct dt_key *)dot, th);
        if (rc != 0)
                GOTO(unlock, rc);
 
-       /* 1b.3. insert dotdot into child dir */
+       /* 4b. insert dotdot into child dir */
        rec->rec_fid = &LU_LPF_FID;
        rc = dt_insert(env, child, (const struct dt_rec *)rec,
-                      (const struct dt_key *)dotdot, th, 1);
+                      (const struct dt_key *)dotdot, th);
        if (rc != 0)
                GOTO(unlock, rc);
 
-       /* 2b. increase child nlink */
-       rc = dt_ref_add(env, child, th);
-       if (rc != 0)
-               GOTO(unlock, rc);
-
-       /* 3b. insert linkEA for child */
+       /* 5b. insert linkEA for child */
        rc = dt_xattr_set(env, child, &linkea_buf,
                          XATTR_NAME_LINK, 0, th);
        if (rc != 0)
@@ -891,7 +951,7 @@ static int lfsck_create_lpf_remote(const struct lu_env *env,
        bk->lb_lpf_fid = *cfid;
        lfsck_bookmark_cpu_to_le(&lfsck->li_bookmark_disk, bk);
 
-       /* 4b. update bookmark */
+       /* 6b. update bookmark */
        rc = dt_record_write(env, bk_obj,
                             lfsck_buf_get(env, bk, len), &pos, th);
 
@@ -903,7 +963,7 @@ static int lfsck_create_lpf_remote(const struct lu_env *env,
        /* Transaction II: remotely */
 
        dev = lfsck_obj2dev(parent);
-       th = dt_trans_create(env, dev);
+       th = lfsck_trans_create(env, dev, lfsck);
        if (IS_ERR(th))
                RETURN(PTR_ERR(th));
 
@@ -926,7 +986,7 @@ static int lfsck_create_lpf_remote(const struct lu_env *env,
 
        /* 5b. insert name into parent dir */
        rc = dt_insert(env, parent, (const struct dt_rec *)rec,
-                      (const struct dt_key *)name, th, 1);
+                      (const struct dt_key *)name, th);
        if (rc != 0)
                GOTO(stop, rc);
 
@@ -997,8 +1057,7 @@ static int lfsck_create_lpf(const struct lu_env *env,
                 * created the .lustre/lost+found/MDTxxxx but failed to update
                 * the lfsck_bookmark::lb_lpf_fid successfully. So need lookup
                 * it from MDT0 firstly. */
-               rc = dt_lookup(env, parent, (struct dt_rec *)cfid,
-                              (const struct dt_key *)name);
+               rc = dt_lookup_dir(env, parent, name, cfid);
                if (rc != 0 && rc != -ENOENT)
                        GOTO(unlock, rc);
 
@@ -1014,7 +1073,7 @@ static int lfsck_create_lpf(const struct lu_env *env,
                *cfid = bk->lb_lpf_fid;
        }
 
-       child = lfsck_object_find_bottom(env, lfsck, cfid);
+       child = lfsck_object_find_bottom_new(env, lfsck, cfid);
        if (IS_ERR(child))
                GOTO(unlock, rc = PTR_ERR(child));
 
@@ -1028,10 +1087,10 @@ static int lfsck_create_lpf(const struct lu_env *env,
        }
 
        memset(la, 0, sizeof(*la));
-       la->la_atime = la->la_mtime = la->la_ctime = cfs_time_current_sec();
+       la->la_atime = la->la_mtime = la->la_ctime = ktime_get_real_seconds();
        la->la_mode = S_IFDIR | S_IRWXU;
        la->la_valid = LA_ATIME | LA_MTIME | LA_CTIME | LA_MODE |
-                      LA_UID | LA_GID;
+                      LA_UID | LA_GID | LA_TYPE;
        memset(dof, 0, sizeof(*dof));
        dof->dof_type = dt_mode_to_dft(S_IFDIR);
 
@@ -1206,8 +1265,7 @@ static int lfsck_verify_lpf_pairs(const struct lu_env *env,
        ENTRY;
 
        fid_zero(fid);
-       rc = dt_lookup(env, child, (struct dt_rec *)fid,
-                      (const struct dt_key *)dotdot);
+       rc = dt_lookup_dir(env, child, dotdot, fid);
        if (rc != 0)
                GOTO(linkea, rc);
 
@@ -1223,7 +1281,7 @@ static int lfsck_verify_lpf_pairs(const struct lu_env *env,
                }
 
                cname = lfsck_name_get_const(env, name, strlen(name));
-               rc = lfsck_verify_linkea(env, child, cname, &LU_LPF_FID);
+               rc = lfsck_verify_linkea(env, lfsck, child, cname, &LU_LPF_FID);
                if (rc == 0)
                        rc = lfsck_update_lpf_entry(env, lfsck, parent, child,
                                                    name, type);
@@ -1292,8 +1350,7 @@ linkea:
                GOTO(out_done, rc = 1);
        }
 
-       rc = dt_lookup(env, parent2, (struct dt_rec *)fid,
-                      (const struct dt_key *)name2);
+       rc = dt_lookup_dir(env, parent2, name2, fid);
        dt_read_unlock(env, child);
        lfsck_ibits_unlock(&lh, LCK_PR);
        if (rc != 0 && rc != -ENOENT)
@@ -1367,6 +1424,9 @@ int lfsck_verify_lpf(const struct lu_env *env, struct lfsck_instance *lfsck)
 
        LASSERT(lfsck->li_master);
 
+       if (lfsck_is_dryrun(lfsck))
+               RETURN(0);
+
        if (lfsck->li_lpf_root_obj != NULL)
                RETURN(0);
 
@@ -1405,61 +1465,12 @@ int lfsck_verify_lpf(const struct lu_env *env, struct lfsck_instance *lfsck)
                               lfsck_lfsck2name(lfsck), rc);
        }
 
-       if (!fid_is_zero(&bk->lb_lpf_fid)) {
-               if (unlikely(!fid_is_norm(&bk->lb_lpf_fid))) {
-                       struct lu_fid tfid = bk->lb_lpf_fid;
-
-                       /* Invalid FID record in the bookmark file, reset it. */
-                       fid_zero(&bk->lb_lpf_fid);
-                       rc = lfsck_bookmark_store(env, lfsck);
-
-                       CDEBUG(D_LFSCK, "%s: reset invalid LPF fid "DFID
-                              " in the bookmark file: rc = %d\n",
-                              lfsck_lfsck2name(lfsck), PFID(&tfid), rc);
-
-                       if (rc != 0)
-                               GOTO(put, rc);
-               } else {
-                       child1 = lfsck_object_find_bottom(env, lfsck,
-                                                         &bk->lb_lpf_fid);
-                       if (IS_ERR(child1)) {
-                               child1 = NULL;
-                               goto find_child2;
-                       }
-
-                       if (unlikely(!dt_object_exists(child1) ||
-                                    dt_object_remote(child1)) ||
-                                    !S_ISDIR(lfsck_object_type(child1))) {
-                               /* Invalid FID record in the bookmark file,
-                                * reset it. */
-                               fid_zero(&bk->lb_lpf_fid);
-                               rc = lfsck_bookmark_store(env, lfsck);
-
-                               CDEBUG(D_LFSCK, "%s: reset invalid LPF fid "DFID
-                                      " in the bookmark file: rc = %d\n",
-                                      lfsck_lfsck2name(lfsck),
-                                      PFID(lfsck_dto2fid(child1)), rc);
-
-                               if (rc != 0)
-                                       GOTO(put, rc);
-
-                               lfsck_object_put(env, child1);
-                               child1 = NULL;
-                       } else if (unlikely(!dt_try_as_dir(env, child1))) {
-                               GOTO(put, rc = -ENOTDIR);
-                       }
-               }
-       }
-
-find_child2:
+       /* child2 */
        snprintf(name, 8, "MDT%04x", node);
-       rc = dt_lookup(env, parent, (struct dt_rec *)cfid,
-                      (const struct dt_key *)name);
+       rc = dt_lookup_dir(env, parent, name, cfid);
        if (rc == -ENOENT) {
-               if (!fid_is_zero(&bk->lb_lpf_fid))
-                       goto check_child1;
-
-               GOTO(put, rc = 0);
+               rc = 0;
+               goto find_child1;
        }
 
        if (rc != 0)
@@ -1471,7 +1482,7 @@ find_child2:
                if (rc != 0)
                        GOTO(put, rc);
 
-               goto check_child1;
+               goto find_child1;
        }
 
        child2 = lfsck_object_find_bottom(env, lfsck, cfid);
@@ -1485,38 +1496,88 @@ find_child2:
                if (rc != 0)
                        GOTO(put, rc);
 
-               goto check_child1;
+               goto find_child1;
        }
 
        if (unlikely(!dt_try_as_dir(env, child2)))
                GOTO(put, rc = -ENOTDIR);
 
-       if (child1 == NULL) {
-               rc = lfsck_verify_lpf_pairs(env, lfsck, child2, name,
-                                           pfid, LVLT_BY_NAMEENTRY);
-       } else if (!lu_fid_eq(cfid, &bk->lb_lpf_fid)) {
-               rc = lfsck_verify_lpf_pairs(env, lfsck, child1, name,
-                                           pfid, LVLT_BY_BOOKMARK);
-               if (!lu_fid_eq(pfid, &LU_LPF_FID))
-                       rc = lfsck_verify_lpf_pairs(env, lfsck, child2,
-                                                   name, pfid,
-                                                   LVLT_BY_NAMEENTRY);
-       } else {
+find_child1:
+       if (fid_is_zero(&bk->lb_lpf_fid))
+               goto check_child2;
+
+       if (likely(lu_fid_eq(cfid, &bk->lb_lpf_fid))) {
                if (lfsck->li_lpf_obj == NULL) {
                        lu_object_get(&child2->do_lu);
                        lfsck->li_lpf_obj = child2;
                }
 
                cname = lfsck_name_get_const(env, name, strlen(name));
-               rc = lfsck_verify_linkea(env, child2, cname, &LU_LPF_FID);
+               rc = lfsck_verify_linkea(env, lfsck, child2, cname,
+                                        &LU_LPF_FID);
+
+               GOTO(put, rc);
        }
 
-       GOTO(put, rc);
+       if (unlikely(!fid_is_norm(&bk->lb_lpf_fid))) {
+               struct lu_fid tfid = bk->lb_lpf_fid;
 
-check_child1:
-       if (child1 != NULL)
-               rc = lfsck_verify_lpf_pairs(env, lfsck, child1, name,
-                                           pfid, LVLT_BY_BOOKMARK);
+               /* Invalid FID record in the bookmark file, reset it. */
+               fid_zero(&bk->lb_lpf_fid);
+               rc = lfsck_bookmark_store(env, lfsck);
+
+               CDEBUG(D_LFSCK, "%s: reset invalid LPF fid "DFID
+                      " in the bookmark file: rc = %d\n",
+                      lfsck_lfsck2name(lfsck), PFID(&tfid), rc);
+
+               if (rc != 0)
+                       GOTO(put, rc);
+
+               goto check_child2;
+       }
+
+       child1 = lfsck_object_find_bottom(env, lfsck, &bk->lb_lpf_fid);
+       if (IS_ERR(child1)) {
+               child1 = NULL;
+               goto check_child2;
+       }
+
+       if (unlikely(!dt_object_exists(child1) ||
+                    dt_object_remote(child1)) ||
+                    !S_ISDIR(lfsck_object_type(child1))) {
+               /* Invalid FID record in the bookmark file, reset it. */
+               fid_zero(&bk->lb_lpf_fid);
+               rc = lfsck_bookmark_store(env, lfsck);
+
+               CDEBUG(D_LFSCK, "%s: reset invalid LPF fid "DFID
+                      " in the bookmark file: rc = %d\n",
+                      lfsck_lfsck2name(lfsck),
+                      PFID(lfsck_dto2fid(child1)), rc);
+
+               if (rc != 0)
+                       GOTO(put, rc);
+
+               lfsck_object_put(env, child1);
+               child1 = NULL;
+               goto check_child2;
+       }
+
+       if (unlikely(!dt_try_as_dir(env, child1))) {
+               lfsck_object_put(env, child1);
+               child1 = NULL;
+               rc = -ENOTDIR;
+               goto check_child2;
+       }
+
+       rc = lfsck_verify_lpf_pairs(env, lfsck, child1, name, pfid,
+                                   LVLT_BY_BOOKMARK);
+       if (lu_fid_eq(pfid, &LU_LPF_FID))
+               GOTO(put, rc);
+
+check_child2:
+       if (child2 != NULL)
+               rc = lfsck_verify_lpf_pairs(env, lfsck, child2, name,
+                                           pfid, LVLT_BY_NAMEENTRY);
 
        GOTO(put, rc);
 
@@ -1559,11 +1620,9 @@ static int lfsck_fid_init(struct lfsck_instance *lfsck)
                GOTO(out, rc = -ENOMEM);
 
        snprintf(prefix, MAX_OBD_NAME + 7, "lfsck-%s", lfsck_lfsck2name(lfsck));
-       rc = seq_client_init(lfsck->li_seq, NULL, LUSTRE_SEQ_METADATA, prefix,
+       seq_client_init(lfsck->li_seq, NULL, LUSTRE_SEQ_METADATA, prefix,
                             ss->ss_server_seq);
        OBD_FREE(prefix, MAX_OBD_NAME + 7);
-       if (rc != 0)
-               GOTO(out, rc);
 
        if (fid_is_sane(&bk->lb_last_fid))
                lfsck->li_seq->lcs_fid = bk->lb_last_fid;
@@ -1605,9 +1664,6 @@ void lfsck_instance_cleanup(const struct lu_env *env,
                lfsck->li_obj_oit = NULL;
        }
 
-       LASSERT(lfsck->li_obj_dir == NULL);
-       LASSERT(lfsck->li_lmv == NULL);
-
        list_for_each_entry_safe(llu, llu_next, &lfsck->li_list_lmv, llu_link) {
                llmv = &llu->llu_lmv;
 
@@ -1714,73 +1770,59 @@ static inline int lfsck_instance_add(struct lfsck_instance *lfsck)
        return 0;
 }
 
-int lfsck_bits_dump(struct seq_file *m, int bits, const char *names[],
-                   const char *prefix)
+void lfsck_bits_dump(struct seq_file *m, int bits, const char *const names[],
+                    const char *prefix)
 {
        int flag;
        int i;
        bool newline = (bits != 0 ? false : true);
-       int rc;
 
-       rc = seq_printf(m, "%s:%c", prefix, bits != 0 ? ' ' : '\n');
-       if (rc < 0)
-               return rc;
+       seq_printf(m, "%s:%c", prefix, bits != 0 ? ' ' : '\n');
 
-       for (i = 0, flag = 1; bits != 0; i++, flag = 1 << i) {
+       for (i = 0, flag = 1; bits != 0; i++, flag = BIT(i)) {
                if (flag & bits) {
                        bits &= ~flag;
                        if (names[i] != NULL) {
                                if (bits == 0)
                                        newline = true;
 
-                               rc = seq_printf(m, "%s%c", names[i],
-                                               newline ? '\n' : ',');
-                               if (rc < 0)
-                                       return rc;
+                               seq_printf(m, "%s%c", names[i],
+                                          newline ? '\n' : ',');
                        }
                }
        }
 
        if (!newline)
-               rc = seq_printf(m, "\n");
-
-       return rc;
+               seq_putc(m, '\n');
 }
 
-int lfsck_time_dump(struct seq_file *m, __u64 time, const char *name)
+void lfsck_time_dump(struct seq_file *m, time64_t time, const char *name)
 {
-       int rc;
-
        if (time == 0) {
-               rc = seq_printf(m, "%s_time: N/A\n", name);
-               if (rc == 0)
-                       rc = seq_printf(m, "time_since_%s: N/A\n", name);
-
-               return rc;
+               seq_printf(m, "%s_time: N/A\n", name);
+               seq_printf(m, "time_since_%s: N/A\n", name);
+       } else {
+               seq_printf(m, "%s_time: %lld\n", name, time);
+               seq_printf(m, "time_since_%s: %lld seconds\n",
+                          name, ktime_get_real_seconds() - time);
        }
-
-       rc = seq_printf(m, "%s_time: "LPU64"\n", name, time);
-       if (rc == 0)
-               rc = seq_printf(m, "time_since_%s: "LPU64" seconds\n",
-                               name, cfs_time_current_sec() - time);
-
-       return rc;
 }
 
-int lfsck_pos_dump(struct seq_file *m, struct lfsck_position *pos,
-                  const char *prefix)
+void lfsck_pos_dump(struct seq_file *m, struct lfsck_position *pos,
+                   const char *prefix)
 {
        if (fid_is_zero(&pos->lp_dir_parent)) {
-               if (pos->lp_oit_cookie == 0)
-                       return seq_printf(m, "%s: N/A, N/A, N/A\n", prefix);
-
-               return seq_printf(m, "%s: "LPU64", N/A, N/A\n",
-                                 prefix, pos->lp_oit_cookie);
+               if (pos->lp_oit_cookie == 0) {
+                       seq_printf(m, "%s: N/A, N/A, N/A\n", prefix);
+                       return;
+               }
+               seq_printf(m, "%s: %llu, N/A, N/A\n",
+                          prefix, pos->lp_oit_cookie);
+       } else {
+               seq_printf(m, "%s: %llu, "DFID", %#llx\n",
+                          prefix, pos->lp_oit_cookie,
+                          PFID(&pos->lp_dir_parent), pos->lp_dir_cookie);
        }
-
-       return seq_printf(m, "%s: "LPU64", "DFID", "LPX64"\n",
-                         prefix, pos->lp_oit_cookie,
-                         PFID(&pos->lp_dir_parent), pos->lp_dir_cookie);
 }
 
 void lfsck_pos_fill(const struct lu_env *env, struct lfsck_instance *lfsck,
@@ -1797,8 +1839,10 @@ void lfsck_pos_fill(const struct lu_env *env, struct lfsck_instance *lfsck,
        if (!lfsck->li_current_oit_processed && !init)
                pos->lp_oit_cookie--;
 
-       LASSERT(pos->lp_oit_cookie > 0);
+       if (unlikely(pos->lp_oit_cookie == 0))
+               pos->lp_oit_cookie = 1;
 
+       spin_lock(&lfsck->li_lock);
        if (lfsck->li_di_dir != NULL) {
                struct dt_object *dto = lfsck->li_obj_dir;
 
@@ -1815,6 +1859,7 @@ void lfsck_pos_fill(const struct lu_env *env, struct lfsck_instance *lfsck,
                fid_zero(&pos->lp_dir_parent);
                pos->lp_dir_cookie = 0;
        }
+       spin_unlock(&lfsck->li_lock);
 }
 
 bool __lfsck_set_speed(struct lfsck_instance *lfsck, __u32 limit)
@@ -1822,14 +1867,12 @@ bool __lfsck_set_speed(struct lfsck_instance *lfsck, __u32 limit)
        bool dirty = false;
 
        if (limit != LFSCK_SPEED_NO_LIMIT) {
-               if (limit > msecs_to_jiffies(MSEC_PER_SEC)) {
-                       lfsck->li_sleep_rate = limit /
-                                              msecs_to_jiffies(MSEC_PER_SEC);
+               if (limit > cfs_time_seconds(1)) {
+                       lfsck->li_sleep_rate = limit / cfs_time_seconds(1);
                        lfsck->li_sleep_jif = 1;
                } else {
                        lfsck->li_sleep_rate = 1;
-                       lfsck->li_sleep_jif = msecs_to_jiffies(MSEC_PER_SEC) /
-                                             limit;
+                       lfsck->li_sleep_jif = cfs_time_seconds(1) / limit;
                }
        } else {
                lfsck->li_sleep_jif = 0;
@@ -1847,16 +1890,12 @@ bool __lfsck_set_speed(struct lfsck_instance *lfsck, __u32 limit)
 void lfsck_control_speed(struct lfsck_instance *lfsck)
 {
        struct ptlrpc_thread *thread = &lfsck->li_thread;
-       struct l_wait_info    lwi;
 
        if (lfsck->li_sleep_jif > 0 &&
            lfsck->li_new_scanned >= lfsck->li_sleep_rate) {
-               lwi = LWI_TIMEOUT_INTR(lfsck->li_sleep_jif, NULL,
-                                      LWI_ON_SIGNAL_NOOP, NULL);
-
-               l_wait_event(thread->t_ctl_waitq,
-                            !thread_is_running(thread),
-                            &lwi);
+               wait_event_idle_timeout(thread->t_ctl_waitq,
+                                       !thread_is_running(thread),
+                                       lfsck->li_sleep_jif);
                lfsck->li_new_scanned = 0;
        }
 }
@@ -1865,16 +1904,12 @@ void lfsck_control_speed_by_self(struct lfsck_component *com)
 {
        struct lfsck_instance   *lfsck  = com->lc_lfsck;
        struct ptlrpc_thread    *thread = &lfsck->li_thread;
-       struct l_wait_info       lwi;
 
        if (lfsck->li_sleep_jif > 0 &&
            com->lc_new_scanned >= lfsck->li_sleep_rate) {
-               lwi = LWI_TIMEOUT_INTR(lfsck->li_sleep_jif, NULL,
-                                      LWI_ON_SIGNAL_NOOP, NULL);
-
-               l_wait_event(thread->t_ctl_waitq,
-                            !thread_is_running(thread),
-                            &lwi);
+               wait_event_idle_timeout(thread->t_ctl_waitq,
+                                       !thread_is_running(thread),
+                                       lfsck->li_sleep_jif);
                com->lc_new_scanned = 0;
        }
 }
@@ -1916,7 +1951,7 @@ void lfsck_thread_args_fini(struct lfsck_thread_args *lta)
 }
 
 struct lfsck_assistant_data *
-lfsck_assistant_data_init(struct lfsck_assistant_operations *lao,
+lfsck_assistant_data_init(const struct lfsck_assistant_operations *lao,
                          const char *name)
 {
        struct lfsck_assistant_data *lad;
@@ -2023,6 +2058,11 @@ int lfsck_async_interpret_common(const struct lu_env *env,
 
        switch (lr->lr_event) {
        case LE_START:
+               if (unlikely(rc == -EINPROGRESS)) {
+                       ltd->ltd_retry_start = 1;
+                       break;
+               }
+
                if (rc != 0) {
                        CDEBUG(D_LFSCK, "%s: fail to notify %s %x for %s "
                               "start: rc = %d\n",
@@ -2122,6 +2162,11 @@ int lfsck_async_interpret_common(const struct lu_env *env,
                }
 
                if (rc != 0) {
+                       if (lr->lr_flags & LEF_QUERY_ALL) {
+                               lfsck_reset_ltd_status(ltd, com->lc_type);
+                               break;
+                       }
+
                        spin_lock(&ltds->ltd_lock);
                        list_del_init(phase_list);
                        list_del_init(list);
@@ -2136,6 +2181,12 @@ int lfsck_async_interpret_common(const struct lu_env *env,
                        CDEBUG(D_LFSCK, "%s: invalid query reply for %s: "
                               "rc = %d\n", lfsck_lfsck2name(com->lc_lfsck),
                               lad->lad_name, rc);
+
+                       if (lr->lr_flags & LEF_QUERY_ALL) {
+                               lfsck_reset_ltd_status(ltd, com->lc_type);
+                               break;
+                       }
+
                        spin_lock(&ltds->ltd_lock);
                        list_del_init(phase_list);
                        list_del_init(list);
@@ -2143,6 +2194,18 @@ int lfsck_async_interpret_common(const struct lu_env *env,
                        break;
                }
 
+               if (lr->lr_flags & LEF_QUERY_ALL) {
+                       if (com->lc_type == LFSCK_TYPE_LAYOUT) {
+                               ltd->ltd_layout_status = reply->lr_status;
+                               ltd->ltd_layout_repaired = reply->lr_repaired;
+                       } else {
+                               ltd->ltd_namespace_status = reply->lr_status;
+                               ltd->ltd_namespace_repaired =
+                                                       reply->lr_repaired;
+                       }
+                       break;
+               }
+
                switch (reply->lr_status) {
                case LS_SCANNING_PHASE1:
                        break;
@@ -2288,12 +2351,12 @@ static int lfsck_stop_notify(const struct lu_env *env,
                if (ltds == &lfsck->li_ost_descs)
                        lr->lr_flags = LEF_TO_OST;
 
+               memset(laia, 0, sizeof(*laia));
                laia->laia_com = com;
                laia->laia_ltds = ltds;
                atomic_inc(&ltd->ltd_ref);
                laia->laia_ltd = ltd;
                laia->laia_lr = lr;
-               laia->laia_shared = 0;
 
                rc = lfsck_async_request(env, ltd->ltd_exp, lr, set,
                                         lfsck_async_interpret_common,
@@ -2306,7 +2369,7 @@ static int lfsck_stop_notify(const struct lu_env *env,
                               ltd->ltd_index, lad->lad_name, rc);
                        lfsck_tgt_put(ltd);
                } else {
-                       rc = ptlrpc_set_wait(set);
+                       rc = ptlrpc_set_wait(env, set);
                }
 
                ptlrpc_set_destroy(set);
@@ -2323,8 +2386,8 @@ static int lfsck_async_interpret(const struct lu_env *env,
        struct lfsck_async_interpret_args *laia = args;
        struct lfsck_instance             *lfsck;
 
-       lfsck = container_of0(laia->laia_ltds, struct lfsck_instance,
-                             li_mdt_descs);
+       lfsck = container_of(laia->laia_ltds, struct lfsck_instance,
+                            li_mdt_descs);
        lfsck_interpret(env, lfsck, req, laia, rc);
        lfsck_tgt_put(laia->laia_ltd);
        if (rc != 0 && laia->laia_result != -EALREADY)
@@ -2373,16 +2436,82 @@ int lfsck_async_request(const struct lu_env *env, struct obd_export *exp,
        *tmp = *lr;
        ptlrpc_request_set_replen(req);
 
-       laia = ptlrpc_req_async_args(req);
+       laia = ptlrpc_req_async_args(laia, req);
        *laia = *(struct lfsck_async_interpret_args *)args;
        if (laia->laia_com != NULL)
                lfsck_component_get(laia->laia_com);
        req->rq_interpret_reply = interpreter;
+       req->rq_allow_intr = 1;
+       req->rq_no_delay = 1;
        ptlrpc_set_add_req(set, req);
 
        return 0;
 }
 
+int lfsck_query_all(const struct lu_env *env, struct lfsck_component *com)
+{
+       struct lfsck_thread_info          *info  = lfsck_env_info(env);
+       struct lfsck_request              *lr    = &info->lti_lr;
+       struct lfsck_async_interpret_args *laia  = &info->lti_laia;
+       struct lfsck_instance             *lfsck = com->lc_lfsck;
+       struct lfsck_tgt_descs            *ltds  = &lfsck->li_mdt_descs;
+       struct lfsck_tgt_desc             *ltd;
+       struct ptlrpc_request_set         *set;
+       int                                idx;
+       int                                rc;
+       ENTRY;
+
+       memset(lr, 0, sizeof(*lr));
+       lr->lr_event = LE_QUERY;
+       lr->lr_active = com->lc_type;
+       lr->lr_flags = LEF_QUERY_ALL;
+
+       memset(laia, 0, sizeof(*laia));
+       laia->laia_com = com;
+       laia->laia_lr = lr;
+
+       set = ptlrpc_prep_set();
+       if (set == NULL)
+               RETURN(-ENOMEM);
+
+again:
+       laia->laia_ltds = ltds;
+       down_read(&ltds->ltd_rw_sem);
+       cfs_foreach_bit(ltds->ltd_tgts_bitmap, idx) {
+               ltd = lfsck_tgt_get(ltds, idx);
+               LASSERT(ltd != NULL);
+
+               laia->laia_ltd = ltd;
+               up_read(&ltds->ltd_rw_sem);
+               rc = lfsck_async_request(env, ltd->ltd_exp, lr, set,
+                                        lfsck_async_interpret_common,
+                                        laia, LFSCK_QUERY);
+               if (rc != 0) {
+                       struct lfsck_assistant_data *lad = com->lc_data;
+
+                       CDEBUG(D_LFSCK, "%s: Fail to query %s %x for stat %s: "
+                              "rc = %d\n", lfsck_lfsck2name(lfsck),
+                              (lr->lr_flags & LEF_TO_OST) ? "OST" : "MDT",
+                              ltd->ltd_index, lad->lad_name, rc);
+                       lfsck_reset_ltd_status(ltd, com->lc_type);
+                       lfsck_tgt_put(ltd);
+               }
+               down_read(&ltds->ltd_rw_sem);
+       }
+       up_read(&ltds->ltd_rw_sem);
+
+       if (com->lc_type == LFSCK_TYPE_LAYOUT && !(lr->lr_flags & LEF_TO_OST)) {
+               ltds = &lfsck->li_ost_descs;
+               lr->lr_flags |= LEF_TO_OST;
+               goto again;
+       }
+
+       rc = ptlrpc_set_wait(env, set);
+       ptlrpc_set_destroy(set);
+
+       RETURN(rc);
+}
+
 int lfsck_start_assistant(const struct lu_env *env, struct lfsck_component *com,
                          struct lfsck_start_param *lsp)
 {
@@ -2397,10 +2526,7 @@ int lfsck_start_assistant(const struct lu_env *env, struct lfsck_component *com,
 
        lad->lad_assistant_status = 0;
        lad->lad_post_result = 0;
-       lad->lad_to_post = 0;
-       lad->lad_to_double_scan = 0;
-       lad->lad_in_double_scan = 0;
-       lad->lad_exit = 0;
+       lad->lad_flags = 0;
        lad->lad_advance_lock = false;
        thread_set_flags(athread, 0);
 
@@ -2415,13 +2541,14 @@ int lfsck_start_assistant(const struct lu_env *env, struct lfsck_component *com,
                       "rc = %d\n", lfsck_lfsck2name(lfsck), lad->lad_name, rc);
                lfsck_thread_args_fini(lta);
        } else {
-               struct l_wait_info lwi = { 0 };
-
-               l_wait_event(mthread->t_ctl_waitq,
-                            thread_is_running(athread) ||
-                            thread_is_stopped(athread),
-                            &lwi);
-               if (unlikely(!thread_is_running(athread)))
+               wait_event_idle(mthread->t_ctl_waitq,
+                               thread_is_running(athread) ||
+                               thread_is_stopped(athread) ||
+                               !thread_is_starting(mthread));
+               if (unlikely(!thread_is_starting(mthread)))
+                       /* stopped by race */
+                       rc = -ESRCH;
+               else if (unlikely(!thread_is_running(athread)))
                        rc = lad->lad_assistant_status;
                else
                        rc = 0;
@@ -2436,13 +2563,11 @@ int lfsck_checkpoint_generic(const struct lu_env *env,
        struct lfsck_assistant_data     *lad     = com->lc_data;
        struct ptlrpc_thread            *mthread = &com->lc_lfsck->li_thread;
        struct ptlrpc_thread            *athread = &lad->lad_thread;
-       struct l_wait_info               lwi     = { 0 };
 
-       l_wait_event(mthread->t_ctl_waitq,
-                    list_empty(&lad->lad_req_list) ||
-                    !thread_is_running(mthread) ||
-                    thread_is_stopped(athread),
-                    &lwi);
+       wait_event_idle(mthread->t_ctl_waitq,
+                       list_empty(&lad->lad_req_list) ||
+                       !thread_is_running(mthread) ||
+                       thread_is_stopped(athread));
 
        if (!thread_is_running(mthread) || thread_is_stopped(athread))
                return LFSCK_CHECKPOINT_SKIP;
@@ -2456,21 +2581,25 @@ void lfsck_post_generic(const struct lu_env *env,
        struct lfsck_assistant_data     *lad     = com->lc_data;
        struct ptlrpc_thread            *athread = &lad->lad_thread;
        struct ptlrpc_thread            *mthread = &com->lc_lfsck->li_thread;
-       struct l_wait_info               lwi     = { 0 };
 
        lad->lad_post_result = *result;
        if (*result <= 0)
-               lad->lad_exit = 1;
-       lad->lad_to_post = 1;
+               set_bit(LAD_EXIT, &lad->lad_flags);
+       set_bit(LAD_TO_POST, &lad->lad_flags);
 
-       wake_up_all(&athread->t_ctl_waitq);
-       l_wait_event(mthread->t_ctl_waitq,
-                    (*result > 0 && list_empty(&lad->lad_req_list)) ||
-                    thread_is_stopped(athread),
-                    &lwi);
+       CDEBUG(D_LFSCK, "%s: waiting for assistant to do %s post, rc = %d\n",
+              lfsck_lfsck2name(com->lc_lfsck), lad->lad_name, *result);
+
+       wake_up(&athread->t_ctl_waitq);
+       wait_event_idle(mthread->t_ctl_waitq,
+                       (*result > 0 && list_empty(&lad->lad_req_list)) ||
+                       thread_is_stopped(athread));
 
        if (lad->lad_assistant_status < 0)
                *result = lad->lad_assistant_status;
+
+       CDEBUG(D_LFSCK, "%s: the assistant has done %s post, rc = %d\n",
+              lfsck_lfsck2name(com->lc_lfsck), lad->lad_name, *result);
 }
 
 int lfsck_double_scan_generic(const struct lu_env *env,
@@ -2479,18 +2608,24 @@ int lfsck_double_scan_generic(const struct lu_env *env,
        struct lfsck_assistant_data     *lad     = com->lc_data;
        struct ptlrpc_thread            *mthread = &com->lc_lfsck->li_thread;
        struct ptlrpc_thread            *athread = &lad->lad_thread;
-       struct l_wait_info               lwi     = { 0 };
 
        if (status != LS_SCANNING_PHASE2)
-               lad->lad_exit = 1;
+               set_bit(LAD_EXIT, &lad->lad_flags);
        else
-               lad->lad_to_double_scan = 1;
+               set_bit(LAD_TO_DOUBLE_SCAN, &lad->lad_flags);
+
+       CDEBUG(D_LFSCK, "%s: waiting for assistant to do %s double_scan, "
+              "status %d\n",
+              lfsck_lfsck2name(com->lc_lfsck), lad->lad_name, status);
 
-       wake_up_all(&athread->t_ctl_waitq);
-       l_wait_event(mthread->t_ctl_waitq,
-                    lad->lad_in_double_scan ||
-                    thread_is_stopped(athread),
-                    &lwi);
+       wake_up(&athread->t_ctl_waitq);
+       wait_event_idle(mthread->t_ctl_waitq,
+                       test_bit(LAD_IN_DOUBLE_SCAN, &lad->lad_flags) ||
+                       thread_is_stopped(athread));
+
+       CDEBUG(D_LFSCK, "%s: the assistant has done %s double_scan, "
+              "status %d\n", lfsck_lfsck2name(com->lc_lfsck), lad->lad_name,
+              lad->lad_assistant_status);
 
        if (lad->lad_assistant_status < 0)
                return lad->lad_assistant_status;
@@ -2504,19 +2639,115 @@ void lfsck_quit_generic(const struct lu_env *env,
        struct lfsck_assistant_data     *lad     = com->lc_data;
        struct ptlrpc_thread            *mthread = &com->lc_lfsck->li_thread;
        struct ptlrpc_thread            *athread = &lad->lad_thread;
-       struct l_wait_info               lwi     = { 0 };
 
-       lad->lad_exit = 1;
-       wake_up_all(&athread->t_ctl_waitq);
-       l_wait_event(mthread->t_ctl_waitq,
-                    thread_is_init(athread) ||
-                    thread_is_stopped(athread),
-                    &lwi);
+       set_bit(LAD_EXIT, &lad->lad_flags);
+       wake_up(&athread->t_ctl_waitq);
+       wait_event_idle(mthread->t_ctl_waitq,
+                       thread_is_init(athread) ||
+                       thread_is_stopped(athread));
 }
 
-/* external interfaces */
+int lfsck_load_one_trace_file(const struct lu_env *env,
+                             struct lfsck_component *com,
+                             struct dt_object *parent,
+                             struct dt_object **child,
+                             const struct dt_index_features *ft,
+                             const char *name, bool reset)
+{
+       struct lfsck_instance *lfsck = com->lc_lfsck;
+       struct dt_object *obj;
+       int rc;
+       ENTRY;
 
-int lfsck_get_speed(struct seq_file *m, struct dt_device *key)
+       if (*child != NULL) {
+               struct dt_it *it;
+               const struct dt_it_ops *iops;
+               struct lu_fid *fid = &lfsck_env_info(env)->lti_fid3;
+
+               if (!reset)
+                       RETURN(0);
+
+               obj = *child;
+               rc = obj->do_ops->do_index_try(env, obj, ft);
+               if (rc)
+                       /* unlink by force */
+                       goto unlink;
+
+               iops = &obj->do_index_ops->dio_it;
+               it = iops->init(env, obj, 0);
+               if (IS_ERR(it))
+                       /* unlink by force */
+                       goto unlink;
+
+               fid_zero(fid);
+               rc = iops->get(env, it, (const struct dt_key *)fid);
+               if (rc >= 0) {
+                       rc = iops->next(env, it);
+                       iops->put(env, it);
+               }
+               iops->fini(env, it);
+               if (rc > 0)
+                       /* "rc > 0" means the index file is empty. */
+                       RETURN(0);
+
+unlink:
+               /* The old index is not empty, remove it firstly. */
+               rc = local_object_unlink(env, lfsck->li_bottom, parent, name);
+               CDEBUG_LIMIT(rc ? D_ERROR : D_LFSCK,
+                            "%s: unlink lfsck sub trace file %s: rc = %d\n",
+                            lfsck_lfsck2name(com->lc_lfsck), name, rc);
+               if (rc)
+                       RETURN(rc);
+
+               if (*child) {
+                       lfsck_object_put(env, *child);
+                       *child = NULL;
+               }
+       } else if (reset) {
+               goto unlink;
+       }
+
+       obj = local_index_find_or_create(env, lfsck->li_los, parent, name,
+                                        S_IFREG | S_IRUGO | S_IWUSR, ft);
+       if (IS_ERR(obj))
+               RETURN(PTR_ERR(obj));
+
+       rc = obj->do_ops->do_index_try(env, obj, ft);
+       if (rc) {
+               lfsck_object_put(env, obj);
+               CDEBUG(D_LFSCK, "%s: LFSCK fail to load "
+                      "sub trace file %s: rc = %d\n",
+                      lfsck_lfsck2name(com->lc_lfsck), name, rc);
+       } else {
+               *child = obj;
+       }
+
+       RETURN(rc);
+}
+
+int lfsck_load_sub_trace_files(const struct lu_env *env,
+                              struct lfsck_component *com,
+                              const struct dt_index_features *ft,
+                              const char *prefix, bool reset)
+{
+       char *name = lfsck_env_info(env)->lti_key;
+       struct lfsck_sub_trace_obj *lsto;
+       int rc;
+       int i;
+
+       for (i = 0, rc = 0, lsto = &com->lc_sub_trace_objs[0];
+            i < LFSCK_STF_COUNT && rc == 0; i++, lsto++) {
+               snprintf(name, NAME_MAX, "%s_%02d", prefix, i);
+               rc = lfsck_load_one_trace_file(env, com,
+                               com->lc_lfsck->li_lfsck_dir,
+                               &lsto->lsto_obj, ft, name, reset);
+       }
+
+       return rc;
+}
+
+/* external interfaces */
+int lfsck_get_speed(char *buf, struct dt_device *key)
 {
        struct lu_env           env;
        struct lfsck_instance  *lfsck;
@@ -2528,8 +2759,9 @@ int lfsck_get_speed(struct seq_file *m, struct dt_device *key)
                RETURN(rc);
 
        lfsck = lfsck_instance_find(key, true, false);
-       if (likely(lfsck != NULL)) {
-               seq_printf(m, "%u\n", lfsck->li_bookmark_ram.lb_speed_limit);
+       if (lfsck && buf) {
+               rc = sprintf(buf, "%u\n",
+                            lfsck->li_bookmark_ram.lb_speed_limit);
                lfsck_instance_put(&env, lfsck);
        } else {
                rc = -ENXIO;
@@ -2541,7 +2773,7 @@ int lfsck_get_speed(struct seq_file *m, struct dt_device *key)
 }
 EXPORT_SYMBOL(lfsck_get_speed);
 
-int lfsck_set_speed(struct dt_device *key, int val)
+int lfsck_set_speed(struct dt_device *key, __u32 val)
 {
        struct lu_env           env;
        struct lfsck_instance  *lfsck;
@@ -2569,7 +2801,7 @@ int lfsck_set_speed(struct dt_device *key, int val)
 }
 EXPORT_SYMBOL(lfsck_set_speed);
 
-int lfsck_get_windows(struct seq_file *m, struct dt_device *key)
+int lfsck_get_windows(char *buf, struct dt_device *key)
 {
        struct lu_env           env;
        struct lfsck_instance  *lfsck;
@@ -2582,7 +2814,8 @@ int lfsck_get_windows(struct seq_file *m, struct dt_device *key)
 
        lfsck = lfsck_instance_find(key, true, false);
        if (likely(lfsck != NULL)) {
-               seq_printf(m, "%u\n", lfsck->li_bookmark_ram.lb_async_windows);
+               rc = sprintf(buf, "%u\n",
+                            lfsck->li_bookmark_ram.lb_async_windows);
                lfsck_instance_put(&env, lfsck);
        } else {
                rc = -ENXIO;
@@ -2594,7 +2827,7 @@ int lfsck_get_windows(struct seq_file *m, struct dt_device *key)
 }
 EXPORT_SYMBOL(lfsck_get_windows);
 
-int lfsck_set_windows(struct dt_device *key, int val)
+int lfsck_set_windows(struct dt_device *key, unsigned int val)
 {
        struct lu_env           env;
        struct lfsck_instance  *lfsck;
@@ -2646,7 +2879,7 @@ int lfsck_dump(struct seq_file *m, struct dt_device *key, enum lfsck_type type)
        if (likely(lfsck != NULL)) {
                com = lfsck_component_find(lfsck, type);
                if (likely(com != NULL)) {
-                       rc = com->lc_ops->lfsck_dump(&env, com, m);
+                       com->lc_ops->lfsck_dump(&env, com, m);
                        lfsck_component_put(&env, com);
                } else {
                        rc = -ENOTSUPP;
@@ -2693,10 +2926,9 @@ static int lfsck_stop_all(const struct lu_env *env,
        lr->lr_active = LFSCK_TYPES_ALL;
        lr->lr_param = stop->ls_flags;
 
-       laia->laia_com = NULL;
+       memset(laia, 0, sizeof(*laia));
        laia->laia_ltds = ltds;
        laia->laia_lr = lr;
-       laia->laia_result = 0;
        laia->laia_shared = 1;
 
        down_read(&ltds->ltd_rw_sem);
@@ -2718,7 +2950,7 @@ static int lfsck_stop_all(const struct lu_env *env,
        }
        up_read(&ltds->ltd_rw_sem);
 
-       rc = ptlrpc_set_wait(set);
+       rc = ptlrpc_set_wait(env, set);
        ptlrpc_set_destroy(set);
 
        if (rc == 0)
@@ -2747,14 +2979,11 @@ static int lfsck_start_all(const struct lu_env *env,
        struct lfsck_bookmark             *bk     = &lfsck->li_bookmark_ram;
        __u32                              idx;
        int                                rc     = 0;
+       bool retry = false;
        ENTRY;
 
        LASSERT(start->ls_flags & LPF_BROADCAST);
 
-       set = ptlrpc_prep_set();
-       if (unlikely(set == NULL))
-               RETURN(-ENOMEM);
-
        memset(lr, 0, sizeof(*lr));
        lr->lr_event = LE_START;
        lr->lr_index = lfsck_dev_idx(lfsck);
@@ -2767,18 +2996,28 @@ static int lfsck_start_all(const struct lu_env *env,
                       LSV_ASYNC_WINDOWS | LSV_CREATE_OSTOBJ |
                       LSV_CREATE_MDTOBJ;
 
-       laia->laia_com = NULL;
+       memset(laia, 0, sizeof(*laia));
        laia->laia_ltds = ltds;
        laia->laia_lr = lr;
-       laia->laia_result = 0;
        laia->laia_shared = 1;
 
+again:
+       set = ptlrpc_prep_set();
+       if (unlikely(!set))
+               RETURN(-ENOMEM);
+
        down_read(&ltds->ltd_rw_sem);
        cfs_foreach_bit(ltds->ltd_tgts_bitmap, idx) {
                ltd = lfsck_tgt_get(ltds, idx);
                LASSERT(ltd != NULL);
 
+               if (retry && !ltd->ltd_retry_start) {
+                       lfsck_tgt_put(ltd);
+                       continue;
+               }
+
                laia->laia_ltd = ltd;
+               ltd->ltd_retry_start = 0;
                ltd->ltd_layout_done = 0;
                ltd->ltd_namespace_done = 0;
                ltd->ltd_synced_failures = 0;
@@ -2802,12 +3041,23 @@ static int lfsck_start_all(const struct lu_env *env,
                RETURN(rc);
        }
 
-       rc = ptlrpc_set_wait(set);
+       rc = ptlrpc_set_wait(env, set);
        ptlrpc_set_destroy(set);
 
        if (rc == 0)
                rc = laia->laia_result;
 
+       if (unlikely(rc == -EINPROGRESS)) {
+               retry = true;
+               schedule_timeout_interruptible(cfs_time_seconds(1));
+               set_current_state(TASK_RUNNING);
+               if (!signal_pending(current) &&
+                   thread_is_running(&lfsck->li_thread))
+                       goto again;
+
+               rc = -EINTR;
+       }
+
        if (rc != 0) {
                struct lfsck_stop *stop = &info->lti_stop;
 
@@ -2832,33 +3082,54 @@ int lfsck_start(const struct lu_env *env, struct dt_device *key,
        struct lfsck_bookmark           *bk;
        struct ptlrpc_thread            *thread;
        struct lfsck_component          *com;
-       struct l_wait_info               lwi    = { 0 };
        struct lfsck_thread_args        *lta;
        struct task_struct              *task;
+       struct lfsck_tgt_descs          *ltds;
+       struct lfsck_tgt_desc           *ltd;
+       __u32                            idx;
        int                              rc     = 0;
        __u16                            valid  = 0;
        __u16                            flags  = 0;
        __u16                            type   = 1;
        ENTRY;
 
+       if (key->dd_rdonly)
+               RETURN(-EROFS);
+
        lfsck = lfsck_instance_find(key, true, false);
        if (unlikely(lfsck == NULL))
                RETURN(-ENXIO);
 
+       if (unlikely(lfsck->li_stopping))
+               GOTO(put, rc = -ENXIO);
+
        /* System is not ready, try again later. */
-       if (unlikely(lfsck->li_namespace == NULL))
-               GOTO(put, rc = -EAGAIN);
+       if (unlikely(lfsck->li_namespace == NULL ||
+                    lfsck_dev_site(lfsck)->ss_server_fld == NULL))
+               GOTO(put, rc = -EINPROGRESS);
 
        /* start == NULL means auto trigger paused LFSCK. */
-       if ((start == NULL) &&
-           (list_empty(&lfsck->li_list_scan) ||
-            OBD_FAIL_CHECK(OBD_FAIL_LFSCK_NO_AUTO)))
-               GOTO(put, rc = 0);
+       if (!start) {
+               if (list_empty(&lfsck->li_list_scan) ||
+                   OBD_FAIL_CHECK(OBD_FAIL_LFSCK_NO_AUTO))
+                       GOTO(put, rc = 0);
+       } else if (start->ls_flags & LPF_BROADCAST && !lfsck->li_master) {
+               CERROR("%s: only allow to specify '-A | -o' via MDS\n",
+                      lfsck_lfsck2name(lfsck));
+
+               GOTO(put, rc = -EPERM);
+       }
 
        bk = &lfsck->li_bookmark_ram;
        thread = &lfsck->li_thread;
        mutex_lock(&lfsck->li_mutex);
        spin_lock(&lfsck->li_lock);
+       if (unlikely(thread_is_stopping(thread))) {
+               /* Someone is stopping the LFSCK. */
+               spin_unlock(&lfsck->li_lock);
+               GOTO(out, rc = -EBUSY);
+       }
+
        if (!thread_is_init(thread) && !thread_is_stopped(thread)) {
                rc = -EALREADY;
                if (unlikely(start == NULL)) {
@@ -2905,13 +3176,6 @@ int lfsck_start(const struct lu_env *env, struct dt_device *key,
        if (start == NULL)
                goto trigger;
 
-       if (start->ls_flags & LPF_BROADCAST && !lfsck->li_master) {
-               CERROR("%s: only allow to specify '-A | -o' via MDS\n",
-                      lfsck_lfsck2name(lfsck));
-
-               GOTO(out, rc = -EPERM);
-       }
-
        start->ls_version = bk->lb_version;
 
        if (start->ls_active != 0) {
@@ -2981,6 +3245,38 @@ int lfsck_start(const struct lu_env *env, struct dt_device *key,
                }
        }
 
+       ltds = &lfsck->li_mdt_descs;
+       down_read(&ltds->ltd_rw_sem);
+       cfs_foreach_bit(ltds->ltd_tgts_bitmap, idx) {
+               ltd = lfsck_ltd2tgt(ltds, idx);
+               LASSERT(ltd != NULL);
+
+               ltd->ltd_layout_done = 0;
+               ltd->ltd_namespace_done = 0;
+               ltd->ltd_synced_failures = 0;
+               lfsck_reset_ltd_status(ltd, LFSCK_TYPE_NAMESPACE);
+               lfsck_reset_ltd_status(ltd, LFSCK_TYPE_LAYOUT);
+               list_del_init(&ltd->ltd_layout_phase_list);
+               list_del_init(&ltd->ltd_layout_list);
+               list_del_init(&ltd->ltd_namespace_phase_list);
+               list_del_init(&ltd->ltd_namespace_list);
+       }
+       up_read(&ltds->ltd_rw_sem);
+
+       ltds = &lfsck->li_ost_descs;
+       down_read(&ltds->ltd_rw_sem);
+       cfs_foreach_bit(ltds->ltd_tgts_bitmap, idx) {
+               ltd = lfsck_ltd2tgt(ltds, idx);
+               LASSERT(ltd != NULL);
+
+               ltd->ltd_layout_done = 0;
+               ltd->ltd_synced_failures = 0;
+               lfsck_reset_ltd_status(ltd, LFSCK_TYPE_LAYOUT);
+               list_del_init(&ltd->ltd_layout_phase_list);
+               list_del_init(&ltd->ltd_layout_list);
+       }
+       up_read(&ltds->ltd_rw_sem);
+
 trigger:
        lfsck->li_args_dir = LUDA_64BITHASH | LUDA_VERIFY | LUDA_TYPE;
        if (bk->lb_param & LPF_DRYRUN)
@@ -3002,12 +3298,14 @@ trigger:
                flags |= DOIF_OUTUSED;
 
        lfsck->li_args_oit = (flags << DT_OTABLE_IT_FLAGS_SHIFT) | valid;
-       thread_set_flags(thread, 0);
        lta = lfsck_thread_args_init(lfsck, NULL, lsp);
        if (IS_ERR(lta))
                GOTO(out, rc = PTR_ERR(lta));
 
        __lfsck_set_speed(lfsck, bk->lb_speed_limit);
+       spin_lock(&lfsck->li_lock);
+       thread_set_flags(thread, SVC_STARTING);
+       spin_unlock(&lfsck->li_lock);
        task = kthread_run(lfsck_master_engine, lta, "lfsck");
        if (IS_ERR(task)) {
                rc = PTR_ERR(task);
@@ -3018,13 +3316,12 @@ trigger:
                GOTO(out, rc);
        }
 
-       l_wait_event(thread->t_ctl_waitq,
-                    thread_is_running(thread) ||
-                    thread_is_stopped(thread),
-                    &lwi);
+       wait_event_idle(thread->t_ctl_waitq,
+                       thread_is_running(thread) ||
+                       thread_is_stopped(thread));
        if (start == NULL || !(start->ls_flags & LPF_BROADCAST)) {
                lfsck->li_start_unplug = 1;
-               wake_up_all(&thread->t_ctl_waitq);
+               wake_up(&thread->t_ctl_waitq);
 
                GOTO(out, rc = 0);
        }
@@ -3043,14 +3340,13 @@ trigger:
                        spin_unlock(&lfsck->li_lock);
 
                        lfsck->li_start_unplug = 1;
-                       wake_up_all(&thread->t_ctl_waitq);
-                       l_wait_event(thread->t_ctl_waitq,
-                                    thread_is_stopped(thread),
-                                    &lwi);
+                       wake_up(&thread->t_ctl_waitq);
+                       wait_event_idle(thread->t_ctl_waitq,
+                                       thread_is_stopped(thread));
                }
        } else {
                lfsck->li_start_unplug = 1;
-               wake_up_all(&thread->t_ctl_waitq);
+               wake_up(&thread->t_ctl_waitq);
        }
 
        GOTO(put, rc);
@@ -3070,7 +3366,6 @@ int lfsck_stop(const struct lu_env *env, struct dt_device *key,
 {
        struct lfsck_instance   *lfsck;
        struct ptlrpc_thread    *thread;
-       struct l_wait_info       lwi    = { 0 };
        int                      rc     = 0;
        int                      rc1    = 0;
        ENTRY;
@@ -3080,27 +3375,26 @@ int lfsck_stop(const struct lu_env *env, struct dt_device *key,
                RETURN(-ENXIO);
 
        thread = &lfsck->li_thread;
-       /* release lfsck::li_mutex to avoid deadlock. */
-       if (stop != NULL && stop->ls_flags & LPF_BROADCAST) {
-               if (!lfsck->li_master) {
-                       CERROR("%s: only allow to specify '-A' via MDS\n",
-                              lfsck_lfsck2name(lfsck));
-
-                       GOTO(out, rc = -EPERM);
-               }
-
-               rc1 = lfsck_stop_all(env, lfsck, stop);
+       if (stop && stop->ls_flags & LPF_BROADCAST && !lfsck->li_master) {
+               CERROR("%s: only allow to specify '-A' via MDS\n",
+                      lfsck_lfsck2name(lfsck));
+               GOTO(put, rc = -EPERM);
        }
 
-       mutex_lock(&lfsck->li_mutex);
        spin_lock(&lfsck->li_lock);
-       /* no error if LFSCK is already stopped, or was never started */
-       if (thread_is_init(thread) || thread_is_stopped(thread)) {
-               spin_unlock(&lfsck->li_lock);
-               GOTO(out, rc = 0);
-       }
+       /* The target is umounted */
+       if (stop && stop->ls_status == LS_PAUSED)
+               lfsck->li_stopping = 1;
+
+       if (thread_is_init(thread) || thread_is_stopped(thread))
+               /* no error if LFSCK stopped already, or not started */
+               GOTO(unlock, rc = 0);
+
+       if (thread_is_stopping(thread))
+               /* Someone is stopping LFSCK. */
+               GOTO(unlock, rc = -EINPROGRESS);
 
-       if (stop != NULL) {
+       if (stop) {
                lfsck->li_status = stop->ls_status;
                lfsck->li_flags = stop->ls_flags;
        } else {
@@ -3109,25 +3403,78 @@ int lfsck_stop(const struct lu_env *env, struct dt_device *key,
        }
 
        thread_set_flags(thread, SVC_STOPPING);
+
+       LASSERT(lfsck->li_task != NULL);
+       cfs_force_sig(SIGINT, lfsck->li_task);
+
+       if (lfsck->li_master) {
+               struct lfsck_component *com;
+               struct lfsck_assistant_data *lad;
+
+               list_for_each_entry(com, &lfsck->li_list_scan, lc_link) {
+                       lad = com->lc_data;
+                       spin_lock(&lad->lad_lock);
+                       if (lad->lad_task != NULL)
+                               cfs_force_sig(SIGINT, lad->lad_task);
+                       spin_unlock(&lad->lad_lock);
+               }
+
+               list_for_each_entry(com, &lfsck->li_list_double_scan, lc_link) {
+                       lad = com->lc_data;
+                       spin_lock(&lad->lad_lock);
+                       if (lad->lad_task != NULL)
+                               cfs_force_sig(SIGINT, lad->lad_task);
+                       spin_unlock(&lad->lad_lock);
+               }
+       }
+
+       wake_up(&thread->t_ctl_waitq);
        spin_unlock(&lfsck->li_lock);
+       if (stop && stop->ls_flags & LPF_BROADCAST)
+               rc1 = lfsck_stop_all(env, lfsck, stop);
 
-       wake_up_all(&thread->t_ctl_waitq);
-       l_wait_event(thread->t_ctl_waitq,
-                    thread_is_stopped(thread),
-                    &lwi);
+       /* It was me set the status as 'stopping' just now, if it is not
+        * 'stopping' now, then either stopped, or re-started by race. */
+       wait_event_idle(thread->t_ctl_waitq,
+                       !thread_is_stopping(thread));
 
-       GOTO(out, rc = 0);
+       GOTO(put, rc = 0);
 
-out:
-       mutex_unlock(&lfsck->li_mutex);
+unlock:
+       spin_unlock(&lfsck->li_lock);
+put:
        lfsck_instance_put(env, lfsck);
 
        return rc != 0 ? rc : rc1;
 }
 EXPORT_SYMBOL(lfsck_stop);
 
+int lfsck_in_notify_local(const struct lu_env *env, struct dt_device *key,
+                         struct lfsck_req_local *lrl, struct thandle *th)
+{
+       struct lfsck_instance *lfsck;
+       struct lfsck_component *com;
+       int rc = -EOPNOTSUPP;
+       ENTRY;
+
+       lfsck = lfsck_instance_find(key, true, false);
+       if (unlikely(!lfsck))
+               RETURN(-ENXIO);
+
+       com = lfsck_component_find(lfsck, lrl->lrl_active);
+       if (likely(com && com->lc_ops->lfsck_in_notify_local)) {
+               rc = com->lc_ops->lfsck_in_notify_local(env, com, lrl, th);
+               lfsck_component_put(env, com);
+       }
+
+       lfsck_instance_put(env, lfsck);
+
+       RETURN(rc);
+}
+EXPORT_SYMBOL(lfsck_in_notify_local);
+
 int lfsck_in_notify(const struct lu_env *env, struct dt_device *key,
-                   struct lfsck_request *lr, struct thandle *th)
+                   struct lfsck_request *lr)
 {
        int rc = -EOPNOTSUPP;
        ENTRY;
@@ -3162,11 +3509,8 @@ int lfsck_in_notify(const struct lu_env *env, struct dt_device *key,
        }
        case LE_PHASE1_DONE:
        case LE_PHASE2_DONE:
-       case LE_FID_ACCESSED:
        case LE_PEER_EXIT:
        case LE_CONDITIONAL_DESTROY:
-       case LE_SKIP_NLINK_DECLARE:
-       case LE_SKIP_NLINK:
        case LE_SET_LMV_MASTER:
        case LE_SET_LMV_SLAVE:
        case LE_PAIRS_VERIFY: {
@@ -3178,8 +3522,8 @@ int lfsck_in_notify(const struct lu_env *env, struct dt_device *key,
                        RETURN(-ENXIO);
 
                com = lfsck_component_find(lfsck, lr->lr_active);
-               if (likely(com != NULL)) {
-                       rc = com->lc_ops->lfsck_in_notify(env, com, lr, th);
+               if (likely(com)) {
+                       rc = com->lc_ops->lfsck_in_notify(env, com, lr);
                        lfsck_component_put(env, com);
                }
 
@@ -3195,29 +3539,96 @@ int lfsck_in_notify(const struct lu_env *env, struct dt_device *key,
 EXPORT_SYMBOL(lfsck_in_notify);
 
 int lfsck_query(const struct lu_env *env, struct dt_device *key,
-               struct lfsck_request *lr)
+               struct lfsck_request *req, struct lfsck_reply *rep,
+               struct lfsck_query *que)
 {
        struct lfsck_instance  *lfsck;
        struct lfsck_component *com;
-       int                     rc;
+       int                     i;
+       int                     rc = 0;
+       __u16                   type;
        ENTRY;
 
        lfsck = lfsck_instance_find(key, true, false);
        if (unlikely(lfsck == NULL))
                RETURN(-ENXIO);
 
-       com = lfsck_component_find(lfsck, lr->lr_active);
-       if (likely(com != NULL)) {
-               rc = com->lc_ops->lfsck_query(env, com);
-               lfsck_component_put(env, com);
+       if (que != NULL) {
+               if (que->lu_types == LFSCK_TYPES_ALL)
+                       que->lu_types =
+                               LFSCK_TYPES_SUPPORTED & ~LFSCK_TYPE_SCRUB;
+
+               if (que->lu_types & ~LFSCK_TYPES_SUPPORTED) {
+                       que->lu_types &= ~LFSCK_TYPES_SUPPORTED;
+
+                       GOTO(out, rc = -ENOTSUPP);
+               }
+
+               for (i = 0, type = BIT(i); i < LFSCK_TYPE_BITS;
+                    i++, type = BIT(i)) {
+                       if (!(que->lu_types & type))
+                               continue;
+
+again:
+                       com = lfsck_component_find(lfsck, type);
+                       if (unlikely(com == NULL))
+                               GOTO(out, rc = -ENOTSUPP);
+
+                       memset(que->lu_mdts_count[i], 0,
+                              sizeof(__u32) * (LS_MAX + 1));
+                       memset(que->lu_osts_count[i], 0,
+                              sizeof(__u32) * (LS_MAX + 1));
+                       que->lu_repaired[i] = 0;
+                       rc = com->lc_ops->lfsck_query(env, com, req, rep,
+                                                     que, i);
+                       lfsck_component_put(env, com);
+                       if  (rc < 0)
+                               GOTO(out, rc);
+               }
+
+               if (!(que->lu_flags & LPF_WAIT))
+                       GOTO(out, rc);
+
+               for (i = 0, type = BIT(i); i < LFSCK_TYPE_BITS;
+                    i++, type = BIT(i)) {
+                       if (!(que->lu_types & type))
+                               continue;
+
+                       if (que->lu_mdts_count[i][LS_SCANNING_PHASE1] != 0 ||
+                           que->lu_mdts_count[i][LS_SCANNING_PHASE2] != 0 ||
+                           que->lu_osts_count[i][LS_SCANNING_PHASE1] != 0 ||
+                           que->lu_osts_count[i][LS_SCANNING_PHASE2] != 0) {
+                               /* If it is required to wait, then sleep
+                                * 3 seconds and try to query again.
+                                */
+                               unsigned long timeout =
+                                       msecs_to_jiffies(3000) + 1;
+                               while (timeout &&
+                                      !fatal_signal_pending(current))
+                                       timeout = schedule_timeout_killable(
+                                               timeout);
+                               if (timeout == 0)
+                                       goto again;
+                       }
+               }
        } else {
-               rc = -ENOTSUPP;
+               com = lfsck_component_find(lfsck, req->lr_active);
+               if (likely(com != NULL)) {
+                       rc = com->lc_ops->lfsck_query(env, com, req, rep,
+                                                     que, -1);
+                       lfsck_component_put(env, com);
+               } else {
+                       rc = -ENOTSUPP;
+               }
        }
 
-       lfsck_instance_put(env, lfsck);
+       GOTO(out, rc);
 
-       RETURN(rc);
+out:
+       lfsck_instance_put(env, lfsck);
+       return rc;
 }
+EXPORT_SYMBOL(lfsck_query);
 
 int lfsck_register_namespace(const struct lu_env *env, struct dt_device *key,
                             struct ldlm_namespace *ns)
@@ -3295,9 +3706,6 @@ int lfsck_register(const struct lu_env *env, struct dt_device *key,
        if (IS_ERR(root))
                GOTO(out, rc = PTR_ERR(root));
 
-       if (unlikely(!dt_try_as_dir(env, root)))
-               GOTO(out, rc = -ENOTDIR);
-
        lfsck->li_local_root_fid = *fid;
        if (master) {
                lfsck->li_master = 1;
@@ -3305,9 +3713,8 @@ int lfsck_register(const struct lu_env *env, struct dt_device *key,
                        struct lu_fid *pfid = &lfsck_env_info(env)->lti_fid2;
                        const struct lu_name *cname;
 
-                       rc = dt_lookup(env, root,
-                               (struct dt_rec *)(&lfsck->li_global_root_fid),
-                               (const struct dt_key *)"ROOT");
+                       rc = dt_lookup_dir(env, root, "ROOT",
+                                          &lfsck->li_global_root_fid);
                        if (rc != 0)
                                GOTO(out, rc);
 
@@ -3315,11 +3722,7 @@ int lfsck_register(const struct lu_env *env, struct dt_device *key,
                        if (IS_ERR(obj))
                                GOTO(out, rc = PTR_ERR(obj));
 
-                       if (unlikely(!dt_try_as_dir(env, obj)))
-                               GOTO(out, rc = -ENOTDIR);
-
-                       rc = dt_lookup(env, obj, (struct dt_rec *)fid,
-                               (const struct dt_key *)dotlustre);
+                       rc = dt_lookup_dir(env, obj, dotlustre, fid);
                        if (rc != 0)
                                GOTO(out, rc);
 
@@ -3330,7 +3733,7 @@ int lfsck_register(const struct lu_env *env, struct dt_device *key,
 
                        cname = lfsck_name_get_const(env, dotlustre,
                                                     strlen(dotlustre));
-                       rc = lfsck_verify_linkea(env, obj, cname,
+                       rc = lfsck_verify_linkea(env, lfsck, obj, cname,
                                                 &lfsck->li_global_root_fid);
                        if (rc != 0)
                                GOTO(out, rc);
@@ -3339,8 +3742,7 @@ int lfsck_register(const struct lu_env *env, struct dt_device *key,
                                GOTO(out, rc = -ENOTDIR);
 
                        *pfid = *fid;
-                       rc = dt_lookup(env, obj, (struct dt_rec *)fid,
-                                      (const struct dt_key *)lostfound);
+                       rc = dt_lookup_dir(env, obj, lostfound, fid);
                        if (rc != 0)
                                GOTO(out, rc);
 
@@ -3351,7 +3753,7 @@ int lfsck_register(const struct lu_env *env, struct dt_device *key,
 
                        cname = lfsck_name_get_const(env, lostfound,
                                                     strlen(lostfound));
-                       rc = lfsck_verify_linkea(env, obj, cname, pfid);
+                       rc = lfsck_verify_linkea(env, lfsck, obj, cname, pfid);
                        if (rc != 0)
                                GOTO(out, rc);
 
@@ -3556,12 +3958,10 @@ static int __init lfsck_init(void)
 {
        int rc;
 
-       INIT_LIST_HEAD(&lfsck_instance_list);
-       INIT_LIST_HEAD(&lfsck_ost_orphan_list);
-       INIT_LIST_HEAD(&lfsck_mdt_orphan_list);
        lfsck_key_init_generic(&lfsck_thread_key, NULL);
        rc = lu_context_key_register(&lfsck_thread_key);
-       if (rc == 0) {
+       if (!rc) {
+               tgt_register_lfsck_in_notify_local(lfsck_in_notify_local);
                tgt_register_lfsck_in_notify(lfsck_in_notify);
                tgt_register_lfsck_query(lfsck_query);
        }