Whamcloud - gitweb
LU-5466 lfsck: typo in lfsck_del_target
[fs/lustre-release.git] / lustre / lfsck / lfsck_lib.c
index 83e9c54..46f75a4 100644 (file)
  * Author: Fan, Yong <fan.yong@intel.com>
  */
 
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
 #define DEBUG_SUBSYSTEM S_LFSCK
 
 #include <libcfs/list.h>
 #include <lu_object.h>
 #include <dt_object.h>
+#include <md_object.h>
+#include <lustre_fld.h>
 #include <lustre_lib.h>
 #include <lustre_net.h>
 #include <lustre_lfsck.h>
@@ -52,6 +51,7 @@ static void lfsck_key_fini(const struct lu_context *ctx,
        struct lfsck_thread_info *info = data;
 
        lu_buf_free(&info->lti_linkea_buf);
+       lu_buf_free(&info->lti_big_buf);
        OBD_FREE_PTR(info);
 }
 
@@ -59,55 +59,223 @@ LU_CONTEXT_KEY_DEFINE(lfsck, LCT_MD_THREAD | LCT_DT_THREAD);
 LU_KEY_INIT_GENERIC(lfsck);
 
 static CFS_LIST_HEAD(lfsck_instance_list);
+static struct list_head lfsck_ost_orphan_list;
+static struct list_head lfsck_mdt_orphan_list;
 static DEFINE_SPINLOCK(lfsck_instance_lock);
 
-const char *lfsck_status_names[] = {
-       "init",
-       "scanning-phase1",
-       "scanning-phase2",
-       "completed",
-       "failed",
-       "stopped",
-       "paused",
-       "crashed",
-       NULL
+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[] = {
        "scanned-once",
        "inconsistent",
        "upgrade",
+       "incomplete",
+       "crashed_lastid",
        NULL
 };
 
 const char *lfsck_param_names[] = {
+       NULL,
        "failout",
        "dryrun",
+       "all_targets",
+       "broadcast",
+       "orphan",
+       "create_ostobj",
        NULL
 };
 
-static inline mdsno_t lfsck_dev_idx(struct dt_device *dev)
+const char *lfsck_status2names(enum lfsck_status status)
+{
+       if (unlikely(status < 0 || status >= LS_MAX))
+               return "unknown";
+
+       return lfsck_status_names[status];
+}
+
+static int lfsck_tgt_descs_init(struct lfsck_tgt_descs *ltds)
 {
-       return dev->dd_lu_dev.ld_site->ld_seq_site->ss_node_id;
+       spin_lock_init(&ltds->ltd_lock);
+       init_rwsem(&ltds->ltd_rw_sem);
+       INIT_LIST_HEAD(&ltds->ltd_orphan);
+       ltds->ltd_tgts_bitmap = CFS_ALLOCATE_BITMAP(BITS_PER_LONG);
+       if (ltds->ltd_tgts_bitmap == NULL)
+               return -ENOMEM;
+
+       return 0;
 }
 
-static inline void lfsck_component_get(struct lfsck_component *com)
+static void lfsck_tgt_descs_fini(struct lfsck_tgt_descs *ltds)
 {
-       atomic_inc(&com->lc_ref);
+       struct lfsck_tgt_desc   *ltd;
+       struct lfsck_tgt_desc   *next;
+       int                      idx;
+
+       down_write(&ltds->ltd_rw_sem);
+
+       list_for_each_entry_safe(ltd, next, &ltds->ltd_orphan,
+                                ltd_orphan_list) {
+               list_del_init(&ltd->ltd_orphan_list);
+               lfsck_tgt_put(ltd);
+       }
+
+       if (unlikely(ltds->ltd_tgts_bitmap == NULL)) {
+               up_write(&ltds->ltd_rw_sem);
+
+               return;
+       }
+
+       cfs_foreach_bit(ltds->ltd_tgts_bitmap, idx) {
+               ltd = LTD_TGT(ltds, idx);
+               if (likely(ltd != NULL)) {
+                       LASSERT(list_empty(&ltd->ltd_layout_list));
+                       LASSERT(list_empty(&ltd->ltd_layout_phase_list));
+
+                       ltds->ltd_tgtnr--;
+                       cfs_bitmap_clear(ltds->ltd_tgts_bitmap, idx);
+                       LTD_TGT(ltds, idx) = NULL;
+                       lfsck_tgt_put(ltd);
+               }
+       }
+
+       LASSERTF(ltds->ltd_tgtnr == 0, "tgt count unmatched: %d\n",
+                ltds->ltd_tgtnr);
+
+       for (idx = 0; idx < TGT_PTRS; idx++) {
+               if (ltds->ltd_tgts_idx[idx] != NULL) {
+                       OBD_FREE_PTR(ltds->ltd_tgts_idx[idx]);
+                       ltds->ltd_tgts_idx[idx] = NULL;
+               }
+       }
+
+       CFS_FREE_BITMAP(ltds->ltd_tgts_bitmap);
+       ltds->ltd_tgts_bitmap = NULL;
+       up_write(&ltds->ltd_rw_sem);
+}
+
+static int __lfsck_add_target(const struct lu_env *env,
+                             struct lfsck_instance *lfsck,
+                             struct lfsck_tgt_desc *ltd,
+                             bool for_ost, bool locked)
+{
+       struct lfsck_tgt_descs *ltds;
+       __u32                   index = ltd->ltd_index;
+       int                     rc    = 0;
+       ENTRY;
+
+       if (for_ost)
+               ltds = &lfsck->li_ost_descs;
+       else
+               ltds = &lfsck->li_mdt_descs;
+
+       if (!locked)
+               down_write(&ltds->ltd_rw_sem);
+
+       LASSERT(ltds->ltd_tgts_bitmap != NULL);
+
+       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;
+
+               while (newsize < index + 1)
+                       newsize <<= 1;
+
+               new_bitmap = CFS_ALLOCATE_BITMAP(newsize);
+               if (new_bitmap == NULL)
+                       GOTO(unlock, rc = -ENOMEM);
+
+               if (ltds->ltd_tgtnr > 0)
+                       cfs_bitmap_copy(new_bitmap, old_bitmap);
+               ltds->ltd_tgts_bitmap = new_bitmap;
+               CFS_FREE_BITMAP(old_bitmap);
+       }
+
+       if (cfs_bitmap_check(ltds->ltd_tgts_bitmap, index)) {
+               CERROR("%s: the device %s (%u) is registered already\n",
+                      lfsck_lfsck2name(lfsck),
+                      ltd->ltd_tgt->dd_lu_dev.ld_obd->obd_name, index);
+               GOTO(unlock, rc = -EEXIST);
+       }
+
+       if (ltds->ltd_tgts_idx[index / TGT_PTRS_PER_BLOCK] == NULL) {
+               OBD_ALLOC_PTR(ltds->ltd_tgts_idx[index / TGT_PTRS_PER_BLOCK]);
+               if (ltds->ltd_tgts_idx[index / TGT_PTRS_PER_BLOCK] == NULL)
+                       GOTO(unlock, rc = -ENOMEM);
+       }
+
+       LTD_TGT(ltds, index) = ltd;
+       cfs_bitmap_set(ltds->ltd_tgts_bitmap, index);
+       ltds->ltd_tgtnr++;
+
+       GOTO(unlock, rc = 0);
+
+unlock:
+       if (!locked)
+               up_write(&ltds->ltd_rw_sem);
+
+       return rc;
 }
 
-static inline void lfsck_component_put(const struct lu_env *env,
-                                      struct lfsck_component *com)
+static int lfsck_add_target_from_orphan(const struct lu_env *env,
+                                       struct lfsck_instance *lfsck)
 {
-       if (atomic_dec_and_test(&com->lc_ref)) {
-               if (com->lc_obj != NULL)
-                       lu_object_put(env, &com->lc_obj->do_lu);
-               if (com->lc_file_ram != NULL)
-                       OBD_FREE(com->lc_file_ram, com->lc_file_size);
-               if (com->lc_file_disk != NULL)
-                       OBD_FREE(com->lc_file_disk, com->lc_file_size);
-               OBD_FREE_PTR(com);
+       struct lfsck_tgt_descs  *ltds    = &lfsck->li_ost_descs;
+       struct lfsck_tgt_desc   *ltd;
+       struct lfsck_tgt_desc   *next;
+       struct list_head        *head    = &lfsck_ost_orphan_list;
+       int                      rc;
+       bool                     for_ost = true;
+
+again:
+       spin_lock(&lfsck_instance_lock);
+       list_for_each_entry_safe(ltd, next, head, ltd_orphan_list) {
+               if (ltd->ltd_key == lfsck->li_bottom) {
+                       list_del_init(&ltd->ltd_orphan_list);
+                       list_add_tail(&ltd->ltd_orphan_list,
+                                     &ltds->ltd_orphan);
+               }
        }
+       spin_unlock(&lfsck_instance_lock);
+
+       down_write(&ltds->ltd_rw_sem);
+       while (!list_empty(&ltds->ltd_orphan)) {
+               ltd = list_entry(ltds->ltd_orphan.next,
+                                struct lfsck_tgt_desc,
+                                ltd_orphan_list);
+               list_del_init(&ltd->ltd_orphan_list);
+               rc = __lfsck_add_target(env, lfsck, ltd, for_ost, true);
+               /* Do not hold the semaphore for too long time. */
+               up_write(&ltds->ltd_rw_sem);
+               if (rc != 0)
+                       return rc;
+
+               down_write(&ltds->ltd_rw_sem);
+       }
+       up_write(&ltds->ltd_rw_sem);
+
+       if (for_ost) {
+               ltds = &lfsck->li_mdt_descs;
+               head = &lfsck_mdt_orphan_list;
+               for_ost = false;
+               goto again;
+       }
+
+       return 0;
 }
 
 static inline struct lfsck_component *
@@ -122,7 +290,7 @@ __lfsck_component_find(struct lfsck_instance *lfsck, __u16 type, cfs_list_t *lis
        return NULL;
 }
 
-static struct lfsck_component *
+struct lfsck_component *
 lfsck_component_find(struct lfsck_instance *lfsck, __u16 type)
 {
        struct lfsck_component *com;
@@ -157,8 +325,525 @@ void lfsck_component_cleanup(const struct lu_env *env,
        lfsck_component_put(env, com);
 }
 
-static void lfsck_instance_cleanup(const struct lu_env *env,
-                                  struct lfsck_instance *lfsck)
+int lfsck_fid_alloc(const struct lu_env *env, struct lfsck_instance *lfsck,
+                   struct lu_fid *fid, bool locked)
+{
+       struct lfsck_bookmark   *bk = &lfsck->li_bookmark_ram;
+       int                      rc = 0;
+       ENTRY;
+
+       if (!locked)
+               mutex_lock(&lfsck->li_mutex);
+
+       rc = seq_client_alloc_fid(env, lfsck->li_seq, fid);
+       if (rc >= 0) {
+               bk->lb_last_fid = *fid;
+               /* We do not care about whether the subsequent sub-operations
+                * failed or not. The worst case is that one FID is lost that
+                * is not a big issue for the LFSCK since it is relative rare
+                * for LFSCK create. */
+               rc = lfsck_bookmark_store(env, lfsck);
+       }
+
+       if (!locked)
+               mutex_unlock(&lfsck->li_mutex);
+
+       RETURN(rc);
+}
+
+static const char dot[] = ".";
+static const char dotdot[] = "..";
+static const char dotlustre[] = ".lustre";
+static const char lostfound[] = "lost+found";
+
+static int lfsck_create_lpf_local(const struct lu_env *env,
+                                 struct lfsck_instance *lfsck,
+                                 struct dt_object *parent,
+                                 struct dt_object *child,
+                                 struct lu_attr *la,
+                                 struct dt_object_format *dof,
+                                 const char *name)
+{
+       struct dt_insert_rec    *rec    = &lfsck_env_info(env)->lti_dt_rec;
+       struct dt_device        *dev    = lfsck->li_bottom;
+       struct lfsck_bookmark   *bk     = &lfsck->li_bookmark_ram;
+       struct dt_object        *bk_obj = lfsck->li_bookmark_obj;
+       const struct lu_fid     *cfid   = lfsck_dto2fid(child);
+       struct thandle          *th     = NULL;
+       struct linkea_data       ldata  = { 0 };
+       struct lu_buf            linkea_buf;
+       const struct lu_name    *cname;
+       loff_t                   pos    = 0;
+       int                      len    = sizeof(struct lfsck_bookmark);
+       int                      rc;
+       ENTRY;
+
+       rc = linkea_data_new(&ldata,
+                            &lfsck_env_info(env)->lti_linkea_buf);
+       if (rc != 0)
+               RETURN(rc);
+
+       cname = lfsck_name_get_const(env, name, strlen(name));
+       rc = linkea_add_buf(&ldata, cname, lfsck_dto2fid(parent));
+       if (rc != 0)
+               RETURN(rc);
+
+       th = dt_trans_create(env, dev);
+       if (IS_ERR(th))
+               RETURN(PTR_ERR(th));
+
+       /* 1a. create child */
+       rc = dt_declare_create(env, child, la, NULL, dof, th);
+       if (rc != 0)
+               GOTO(stop, rc);
+
+       /* 2a. increase child nlink */
+       rc = dt_declare_ref_add(env, child, th);
+       if (rc != 0)
+               GOTO(stop, rc);
+
+       /* 3a. insert linkEA for child */
+       linkea_buf.lb_buf = ldata.ld_buf->lb_buf;
+       linkea_buf.lb_len = ldata.ld_leh->leh_len;
+       rc = dt_declare_xattr_set(env, child, &linkea_buf,
+                                 XATTR_NAME_LINK, 0, th);
+       if (rc != 0)
+               GOTO(stop, rc);
+
+       /* 4a. 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,
+                              (const struct dt_key *)name, th);
+       if (rc != 0)
+               GOTO(stop, rc);
+
+       /* 5a. increase parent nlink */
+       rc = dt_declare_ref_add(env, parent, th);
+       if (rc != 0)
+               GOTO(stop, rc);
+
+       /* 6a. update bookmark */
+       rc = dt_declare_record_write(env, bk_obj,
+                                    lfsck_buf_get(env, bk, len), 0, th);
+       if (rc != 0)
+               GOTO(stop, rc);
+
+       rc = dt_trans_start_local(env, dev, th);
+       if (rc != 0)
+               GOTO(stop, rc);
+
+       dt_write_lock(env, child, 0);
+       /* 1b.1. 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);
+
+       /* 1b.2. 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, BYPASS_CAPA, 1);
+       if (rc != 0)
+               GOTO(unlock, rc);
+
+       /* 1b.3. 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, BYPASS_CAPA, 1);
+       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. */
+       rc = dt_xattr_set(env, child, &linkea_buf,
+                         XATTR_NAME_LINK, 0, th, BYPASS_CAPA);
+       dt_write_unlock(env, child);
+       if (rc != 0)
+               GOTO(stop, rc);
+
+       /* 4b. 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, BYPASS_CAPA, 1);
+       if (rc != 0)
+               GOTO(stop, rc);
+
+       dt_write_lock(env, parent, 0);
+       /* 5b. increase parent nlink */
+       rc = dt_ref_add(env, parent, th);
+       dt_write_unlock(env, parent);
+       if (rc != 0)
+               GOTO(stop, rc);
+
+       bk->lb_lpf_fid = *cfid;
+       lfsck_bookmark_cpu_to_le(&lfsck->li_bookmark_disk, bk);
+
+       /* 6b. update bookmark */
+       rc = dt_record_write(env, bk_obj,
+                            lfsck_buf_get(env, bk, len), &pos, th);
+
+       GOTO(stop, rc);
+
+unlock:
+       dt_write_unlock(env, child);
+
+stop:
+       dt_trans_stop(env, dev, th);
+
+       return rc;
+}
+
+static int lfsck_create_lpf_remote(const struct lu_env *env,
+                                  struct lfsck_instance *lfsck,
+                                  struct dt_object *parent,
+                                  struct dt_object *child,
+                                  struct lu_attr *la,
+                                  struct dt_object_format *dof,
+                                  const char *name)
+{
+       struct dt_insert_rec    *rec    = &lfsck_env_info(env)->lti_dt_rec;
+       struct lfsck_bookmark   *bk     = &lfsck->li_bookmark_ram;
+       struct dt_object        *bk_obj = lfsck->li_bookmark_obj;
+       const struct lu_fid     *cfid   = lfsck_dto2fid(child);
+       struct thandle          *th     = NULL;
+       struct linkea_data       ldata  = { 0 };
+       struct lu_buf            linkea_buf;
+       const struct lu_name    *cname;
+       struct dt_device        *dev;
+       loff_t                   pos    = 0;
+       int                      len    = sizeof(struct lfsck_bookmark);
+       int                      rc;
+       ENTRY;
+
+       rc = linkea_data_new(&ldata,
+                            &lfsck_env_info(env)->lti_linkea_buf);
+       if (rc != 0)
+               RETURN(rc);
+
+       cname = lfsck_name_get_const(env, name, strlen(name));
+       rc = linkea_add_buf(&ldata, cname, lfsck_dto2fid(parent));
+       if (rc != 0)
+               RETURN(rc);
+
+       /* Create .lustre/lost+found/MDTxxxx. */
+
+       /* XXX: Currently, cross-MDT create operation needs to create the child
+        *      object firstly, then insert name into the parent directory. For
+        *      this case, the child object resides on current MDT (local), but
+        *      the parent ".lustre/lost+found" may be on remote MDT. It is not
+        *      easy to contain all the sub-modifications orderly within single
+        *      transaction.
+        *
+        *      To avoid more inconsistency, we split the create operation into
+        *      two transactions:
+        *
+        *      1) create the child and update the lfsck_bookmark::lb_lpf_fid
+        *         locally.
+        *      2) insert the name "MDTXXXX" in the parent ".lustre/lost+found"
+        *         remotely.
+        *
+        *      If 1) done, but 2) failed, then go ahead, the LFSCK will try to
+        *      repair such inconsistency when LFSCK run next time. */
+
+       /* Transaction I: locally */
+
+       dev = lfsck->li_bottom;
+       th = dt_trans_create(env, dev);
+       if (IS_ERR(th))
+               RETURN(PTR_ERR(th));
+
+       /* 1a. create child */
+       rc = dt_declare_create(env, child, la, NULL, dof, th);
+       if (rc != 0)
+               GOTO(stop, rc);
+
+       /* 2a. increase child nlink */
+       rc = dt_declare_ref_add(env, child, th);
+       if (rc != 0)
+               GOTO(stop, rc);
+
+       /* 3a. insert linkEA for child */
+       linkea_buf.lb_buf = ldata.ld_buf->lb_buf;
+       linkea_buf.lb_len = ldata.ld_leh->leh_len;
+       rc = dt_declare_xattr_set(env, child, &linkea_buf,
+                                 XATTR_NAME_LINK, 0, th);
+       if (rc != 0)
+               GOTO(stop, rc);
+
+       /* 4a. update bookmark */
+       rc = dt_declare_record_write(env, bk_obj,
+                                    lfsck_buf_get(env, bk, len), 0, th);
+       if (rc != 0)
+               GOTO(stop, rc);
+
+       rc = dt_trans_start_local(env, dev, th);
+       if (rc != 0)
+               GOTO(stop, rc);
+
+       dt_write_lock(env, child, 0);
+       /* 1b.1. 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);
+
+       /* 1b.2. 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, BYPASS_CAPA, 1);
+       if (rc != 0)
+               GOTO(unlock, rc);
+
+       /* 1b.3. 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, BYPASS_CAPA, 1);
+       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 */
+       rc = dt_xattr_set(env, child, &linkea_buf,
+                         XATTR_NAME_LINK, 0, th, BYPASS_CAPA);
+       if (rc != 0)
+               GOTO(unlock, rc);
+
+       bk->lb_lpf_fid = *cfid;
+       lfsck_bookmark_cpu_to_le(&lfsck->li_bookmark_disk, bk);
+
+       /* 4b. update bookmark */
+       rc = dt_record_write(env, bk_obj,
+                            lfsck_buf_get(env, bk, len), &pos, th);
+
+       dt_write_unlock(env, child);
+       dt_trans_stop(env, dev, th);
+       if (rc != 0)
+               RETURN(rc);
+
+       /* Transaction II: remotely */
+
+       dev = lfsck->li_next;
+       th = dt_trans_create(env, dev);
+       if (IS_ERR(th))
+               RETURN(PTR_ERR(th));
+
+       /* 5a. insert name into parent dir */
+       rec->rec_fid = cfid;
+       rc = dt_declare_insert(env, parent, (const struct dt_rec *)rec,
+                              (const struct dt_key *)name, th);
+       if (rc != 0)
+               GOTO(stop, rc);
+
+       /* 6a. increase parent nlink */
+       rc = dt_declare_ref_add(env, parent, th);
+       if (rc != 0)
+               GOTO(stop, rc);
+
+       rc = dt_trans_start(env, dev, th);
+       if (rc != 0)
+               GOTO(stop, rc);
+
+       /* 5b. insert name into parent dir */
+       rc = dt_insert(env, parent, (const struct dt_rec *)rec,
+                      (const struct dt_key *)name, th, BYPASS_CAPA, 1);
+       if (rc != 0)
+               GOTO(stop, rc);
+
+       dt_write_lock(env, parent, 0);
+       /* 6b. increase parent nlink */
+       rc = dt_ref_add(env, parent, th);
+       dt_write_unlock(env, parent);
+
+       GOTO(stop, rc);
+
+unlock:
+       dt_write_unlock(env, child);
+stop:
+       dt_trans_stop(env, dev, th);
+
+       if (rc != 0 && dev == lfsck->li_next)
+               CDEBUG(D_LFSCK, "%s: partially created the object "DFID
+                      "for orphans, but failed to insert the name %s "
+                      "to the .lustre/lost+found/. Such inconsistency "
+                      "will be repaired when LFSCK run next time: rc = %d\n",
+                      lfsck_lfsck2name(lfsck), PFID(cfid), name, rc);
+
+       return rc;
+}
+
+/* Do NOT create .lustre/lost+found/MDTxxxx when register the lfsck instance,
+ * because the MDT0 maybe not reaady for sequence allocation yet. We do that
+ * only when it is required, such as orphan OST-objects repairing. */
+int lfsck_create_lpf(const struct lu_env *env, struct lfsck_instance *lfsck)
+{
+       struct lfsck_bookmark    *bk    = &lfsck->li_bookmark_ram;
+       struct lfsck_thread_info *info  = lfsck_env_info(env);
+       struct lu_fid            *cfid  = &info->lti_fid2;
+       struct lu_attr           *la    = &info->lti_la;
+       struct dt_object_format  *dof   = &info->lti_dof;
+       struct dt_object         *parent = NULL;
+       struct dt_object         *child = NULL;
+       char                      name[8];
+       int                       node  = lfsck_dev_idx(lfsck->li_bottom);
+       int                       rc    = 0;
+       ENTRY;
+
+       LASSERT(lfsck->li_master);
+
+       sprintf(name, "MDT%04x", node);
+       if (node == 0) {
+               parent = lfsck_object_find_by_dev(env, lfsck->li_bottom,
+                                                 &LU_LPF_FID);
+       } else {
+               struct lfsck_tgt_desc *ltd;
+
+               ltd = lfsck_tgt_get(&lfsck->li_mdt_descs, 0);
+               if (unlikely(ltd == NULL))
+                       RETURN(-ENXIO);
+
+               parent = lfsck_object_find_by_dev(env, ltd->ltd_tgt,
+                                                 &LU_LPF_FID);
+               lfsck_tgt_put(ltd);
+       }
+       if (IS_ERR(parent))
+               RETURN(PTR_ERR(parent));
+
+       if (unlikely(!dt_try_as_dir(env, parent)))
+               GOTO(out, rc = -ENOTDIR);
+
+       mutex_lock(&lfsck->li_mutex);
+       if (lfsck->li_lpf_obj != NULL)
+               GOTO(unlock, rc = 0);
+
+       if (fid_is_zero(&bk->lb_lpf_fid)) {
+               /* There is corner case that: in former LFSCK scanning we have
+                * 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, BYPASS_CAPA);
+               if (rc != 0 && rc != -ENOENT)
+                       GOTO(unlock, rc);
+
+               if (rc == 0) {
+                       bk->lb_lpf_fid = *cfid;
+                       rc = lfsck_bookmark_store(env, lfsck);
+               } else {
+                       rc = lfsck_fid_alloc(env, lfsck, cfid, true);
+               }
+               if (rc != 0)
+                       GOTO(unlock, rc);
+       } else {
+               *cfid = bk->lb_lpf_fid;
+       }
+
+       child = lfsck_object_find_by_dev(env, lfsck->li_bottom, cfid);
+       if (IS_ERR(child))
+               GOTO(unlock, rc = PTR_ERR(child));
+
+       if (dt_object_exists(child) != 0) {
+               if (unlikely(!dt_try_as_dir(env, child)))
+                       rc = -ENOTDIR;
+               else
+                       lfsck->li_lpf_obj = child;
+
+               GOTO(unlock, rc);
+       }
+
+       memset(la, 0, sizeof(*la));
+       la->la_atime = la->la_mtime = la->la_ctime = cfs_time_current_sec();
+       la->la_mode = S_IFDIR | S_IRWXU;
+       la->la_valid = LA_ATIME | LA_MTIME | LA_CTIME | LA_MODE |
+                      LA_UID | LA_GID;
+       memset(dof, 0, sizeof(*dof));
+       dof->dof_type = dt_mode_to_dft(S_IFDIR);
+
+       if (node == 0)
+               rc = lfsck_create_lpf_local(env, lfsck, parent, child, la,
+                                           dof, name);
+       else
+               rc = lfsck_create_lpf_remote(env, lfsck, parent, child, la,
+                                            dof, name);
+       if (rc == 0)
+               lfsck->li_lpf_obj = child;
+
+       GOTO(unlock, rc);
+
+unlock:
+       mutex_unlock(&lfsck->li_mutex);
+       if (rc != 0 && child != NULL && !IS_ERR(child))
+               lu_object_put(env, &child->do_lu);
+out:
+       if (parent != NULL && !IS_ERR(parent))
+               lu_object_put(env, &parent->do_lu);
+
+       return rc;
+}
+
+static int lfsck_fid_init(struct lfsck_instance *lfsck)
+{
+       struct lfsck_bookmark   *bk     = &lfsck->li_bookmark_ram;
+       struct seq_server_site  *ss;
+       char                    *prefix;
+       int                      rc     = 0;
+       ENTRY;
+
+       ss = lu_site2seq(lfsck->li_bottom->dd_lu_dev.ld_site);
+       if (unlikely(ss == NULL))
+               RETURN(-ENXIO);
+
+       OBD_ALLOC_PTR(lfsck->li_seq);
+       if (lfsck->li_seq == NULL)
+               RETURN(-ENOMEM);
+
+       OBD_ALLOC(prefix, MAX_OBD_NAME + 7);
+       if (prefix == NULL)
+               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,
+                            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;
+
+       RETURN(0);
+
+out:
+       OBD_FREE_PTR(lfsck->li_seq);
+       lfsck->li_seq = NULL;
+
+       return rc;
+}
+
+static void lfsck_fid_fini(struct lfsck_instance *lfsck)
+{
+       if (lfsck->li_seq != NULL) {
+               seq_client_fini(lfsck->li_seq);
+               OBD_FREE_PTR(lfsck->li_seq);
+               lfsck->li_seq = NULL;
+       }
+}
+
+void lfsck_instance_cleanup(const struct lu_env *env,
+                           struct lfsck_instance *lfsck)
 {
        struct ptlrpc_thread    *thread = &lfsck->li_thread;
        struct lfsck_component  *com;
@@ -168,7 +853,7 @@ static void lfsck_instance_cleanup(const struct lu_env *env,
        LASSERT(thread_is_init(thread) || thread_is_stopped(thread));
 
        if (lfsck->li_obj_oit != NULL) {
-               lu_object_put(env, &lfsck->li_obj_oit->do_lu);
+               lu_object_put_nocache(env, &lfsck->li_obj_oit->do_lu);
                lfsck->li_obj_oit = NULL;
        }
 
@@ -197,56 +882,60 @@ static void lfsck_instance_cleanup(const struct lu_env *env,
                lfsck_component_cleanup(env, com);
        }
 
+       lfsck_tgt_descs_fini(&lfsck->li_ost_descs);
+       lfsck_tgt_descs_fini(&lfsck->li_mdt_descs);
+
        if (lfsck->li_bookmark_obj != NULL) {
-               lu_object_put(env, &lfsck->li_bookmark_obj->do_lu);
+               lu_object_put_nocache(env, &lfsck->li_bookmark_obj->do_lu);
                lfsck->li_bookmark_obj = NULL;
        }
 
+       if (lfsck->li_lpf_obj != NULL) {
+               lu_object_put(env, &lfsck->li_lpf_obj->do_lu);
+               lfsck->li_lpf_obj = NULL;
+       }
+
        if (lfsck->li_los != NULL) {
                local_oid_storage_fini(env, lfsck->li_los);
                lfsck->li_los = NULL;
        }
 
-       if (lfsck->li_local_root != NULL) {
-               lu_object_put(env, &lfsck->li_local_root->do_lu);
-               lfsck->li_local_root = NULL;
-       }
+       lfsck_fid_fini(lfsck);
 
        OBD_FREE_PTR(lfsck);
 }
 
-static inline void lfsck_instance_get(struct lfsck_instance *lfsck)
-{
-       atomic_inc(&lfsck->li_ref);
-}
-
-static inline void lfsck_instance_put(const struct lu_env *env,
-                                     struct lfsck_instance *lfsck)
-{
-       if (atomic_dec_and_test(&lfsck->li_ref))
-               lfsck_instance_cleanup(env, lfsck);
-}
-
-static inline struct lfsck_instance *lfsck_instance_find(struct dt_device *key,
-                                                        bool ref, bool unlink)
+static inline struct lfsck_instance *
+__lfsck_instance_find(struct dt_device *key, bool ref, bool unlink)
 {
        struct lfsck_instance *lfsck;
 
-       spin_lock(&lfsck_instance_lock);
        cfs_list_for_each_entry(lfsck, &lfsck_instance_list, li_link) {
                if (lfsck->li_bottom == key) {
                        if (ref)
                                lfsck_instance_get(lfsck);
                        if (unlink)
                                list_del_init(&lfsck->li_link);
-                       spin_unlock(&lfsck_instance_lock);
+
                        return lfsck;
                }
        }
-       spin_unlock(&lfsck_instance_lock);
+
        return NULL;
 }
 
+struct lfsck_instance *lfsck_instance_find(struct dt_device *key, bool ref,
+                                          bool unlink)
+{
+       struct lfsck_instance *lfsck;
+
+       spin_lock(&lfsck_instance_lock);
+       lfsck = __lfsck_instance_find(key, ref, unlink);
+       spin_unlock(&lfsck_instance_lock);
+
+       return lfsck;
+}
+
 static inline int lfsck_instance_add(struct lfsck_instance *lfsck)
 {
        struct lfsck_instance *tmp;
@@ -264,75 +953,59 @@ static inline int lfsck_instance_add(struct lfsck_instance *lfsck)
        return 0;
 }
 
-int lfsck_bits_dump(char **buf, int *len, int bits, const char *names[],
+int lfsck_bits_dump(struct seq_file *m, int bits, const char *names[],
                    const char *prefix)
 {
-       int save = *len;
        int flag;
-       int rc;
        int i;
+       bool newline = (bits != 0 ? false : true);
 
-       rc = snprintf(*buf, *len, "%s:%c", prefix, bits != 0 ? ' ' : '\n');
-       if (rc <= 0)
-               return -ENOSPC;
+       seq_printf(m, "%s:%c", prefix, bits != 0 ? ' ' : '\n');
 
-       *buf += rc;
-       *len -= rc;
        for (i = 0, flag = 1; bits != 0; i++, flag = 1 << i) {
                if (flag & bits) {
                        bits &= ~flag;
-                       rc = snprintf(*buf, *len, "%s%c", names[i],
-                                     bits != 0 ? ',' : '\n');
-                       if (rc <= 0)
-                               return -ENOSPC;
+                       if (names[i] != NULL) {
+                               if (bits == 0)
+                                       newline = true;
 
-                       *buf += rc;
-                       *len -= rc;
+                               seq_printf(m, "%s%c", names[i],
+                                          newline ? '\n' : ',');
+                       }
                }
        }
-       return save - *len;
+
+       if (!newline)
+               seq_printf(m, "\n");
+       return 0;
 }
 
-int lfsck_time_dump(char **buf, int *len, __u64 time, const char *prefix)
+int lfsck_time_dump(struct seq_file *m, __u64 time, const char *prefix)
 {
-       int rc;
-
        if (time != 0)
-               rc = snprintf(*buf, *len, "%s: "LPU64" seconds\n", prefix,
-                             cfs_time_current_sec() - time);
+               seq_printf(m, "%s: "LPU64" seconds\n", prefix,
+                         cfs_time_current_sec() - time);
        else
-               rc = snprintf(*buf, *len, "%s: N/A\n", prefix);
-       if (rc <= 0)
-               return -ENOSPC;
-
-       *buf += rc;
-       *len -= rc;
-       return rc;
+               seq_printf(m, "%s: N/A\n", prefix);
+       return 0;
 }
 
-int lfsck_pos_dump(char **buf, int *len, struct lfsck_position *pos,
+int lfsck_pos_dump(struct seq_file *m, struct lfsck_position *pos,
                   const char *prefix)
 {
-       int rc;
-
        if (fid_is_zero(&pos->lp_dir_parent)) {
                if (pos->lp_oit_cookie == 0)
-                       rc = snprintf(*buf, *len, "%s: N/A, N/A, N/A\n",
-                                     prefix);
+                       seq_printf(m, "%s: N/A, N/A, N/A\n",
+                                  prefix);
                else
-                       rc = snprintf(*buf, *len, "%s: "LPU64", N/A, N/A\n",
-                                     prefix, pos->lp_oit_cookie);
+                       seq_printf(m, "%s: "LPU64", N/A, N/A\n",
+                                  prefix, pos->lp_oit_cookie);
        } else {
-               rc = snprintf(*buf, *len, "%s: "LPU64", "DFID", "LPU64"\n",
-                             prefix, pos->lp_oit_cookie,
-                             PFID(&pos->lp_dir_parent), pos->lp_dir_cookie);
+               seq_printf(m, "%s: "LPU64", "DFID", "LPX64"\n",
+                          prefix, pos->lp_oit_cookie,
+                          PFID(&pos->lp_dir_parent), pos->lp_dir_cookie);
        }
-       if (rc <= 0)
-               return -ENOSPC;
-
-       *buf += rc;
-       *len -= rc;
-       return rc;
+       return 0;
 }
 
 void lfsck_pos_fill(const struct lu_env *env, struct lfsck_instance *lfsck,
@@ -340,9 +1013,7 @@ void lfsck_pos_fill(const struct lu_env *env, struct lfsck_instance *lfsck,
 {
        const struct dt_it_ops *iops = &lfsck->li_obj_oit->do_index_ops->dio_it;
 
-       spin_lock(&lfsck->li_lock);
        if (unlikely(lfsck->li_di_oit == NULL)) {
-               spin_unlock(&lfsck->li_lock);
                memset(pos, 0, sizeof(*pos));
                return;
        }
@@ -363,30 +1034,37 @@ void lfsck_pos_fill(const struct lu_env *env, struct lfsck_instance *lfsck,
                        fid_zero(&pos->lp_dir_parent);
                        pos->lp_dir_cookie = 0;
                } else {
-                       pos->lp_dir_parent = *lu_object_fid(&dto->do_lu);
+                       pos->lp_dir_parent = *lfsck_dto2fid(dto);
                }
        } else {
                fid_zero(&pos->lp_dir_parent);
                pos->lp_dir_cookie = 0;
        }
-       spin_unlock(&lfsck->li_lock);
 }
 
-static void __lfsck_set_speed(struct lfsck_instance *lfsck, __u32 limit)
+bool __lfsck_set_speed(struct lfsck_instance *lfsck, __u32 limit)
 {
-       lfsck->li_bookmark_ram.lb_speed_limit = limit;
+       bool dirty = false;
+
        if (limit != LFSCK_SPEED_NO_LIMIT) {
-               if (limit > CFS_HZ) {
-                       lfsck->li_sleep_rate = limit / CFS_HZ;
+               if (limit > HZ) {
+                       lfsck->li_sleep_rate = limit / HZ;
                        lfsck->li_sleep_jif = 1;
                } else {
                        lfsck->li_sleep_rate = 1;
-                       lfsck->li_sleep_jif = CFS_HZ / limit;
+                       lfsck->li_sleep_jif = HZ / limit;
                }
        } else {
                lfsck->li_sleep_jif = 0;
                lfsck->li_sleep_rate = 0;
        }
+
+       if (lfsck->li_bookmark_ram.lb_speed_limit != limit) {
+               lfsck->li_bookmark_ram.lb_speed_limit = limit;
+               dirty = true;
+       }
+
+       return dirty;
 }
 
 void lfsck_control_speed(struct lfsck_instance *lfsck)
@@ -396,20 +1074,31 @@ void lfsck_control_speed(struct lfsck_instance *lfsck)
 
        if (lfsck->li_sleep_jif > 0 &&
            lfsck->li_new_scanned >= lfsck->li_sleep_rate) {
-               spin_lock(&lfsck->li_lock);
-               if (likely(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);
-                       spin_unlock(&lfsck->li_lock);
+               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);
-                       lfsck->li_new_scanned = 0;
-               } else {
-                       spin_unlock(&lfsck->li_lock);
-               }
+               l_wait_event(thread->t_ctl_waitq,
+                            !thread_is_running(thread),
+                            &lwi);
+               lfsck->li_new_scanned = 0;
+       }
+}
+
+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);
+               com->lc_new_scanned = 0;
        }
 }
 
@@ -448,8 +1137,8 @@ static int lfsck_needs_scan_dir(const struct lu_env *env,
                        return 1;
                }
 
-               /* .lustre doesn't contain "real" user objects, no need lfsck */
-               if (fid_is_dot_lustre(lfsck_dto2fid(obj))) {
+               /* No need to check .lustre and its children. */
+               if (fid_seq_is_dot_lustre(fid_seq(lfsck_dto2fid(obj)))) {
                        if (depth > 0)
                                lfsck_object_put(env, obj);
                        return 0;
@@ -485,8 +1174,7 @@ static int lfsck_needs_scan_dir(const struct lu_env *env,
                if (rc != 0)
                        return rc;
 
-               if (unlikely(lu_fid_eq(fid,
-                                      lfsck_dto2fid(lfsck->li_local_root))))
+               if (unlikely(lu_fid_eq(fid, &lfsck->li_local_root_fid)))
                        return 0;
 
                obj = lfsck_object_find(env, lfsck, fid);
@@ -500,10 +1188,16 @@ static int lfsck_needs_scan_dir(const struct lu_env *env,
                        return 0;
                }
 
-               /* Currently, only client visible directory can be remote. */
                if (dt_object_remote(obj)) {
+                       /* .lustre/lost+found/MDTxxx can be remote directory. */
+                       if (fid_seq_is_dot_lustre(fid_seq(lfsck_dto2fid(obj))))
+                               rc = 0;
+                       else
+                               /* Other remote directory should be client
+                                * visible and need to be checked. */
+                               rc = 1;
                        lfsck_object_put(env, obj);
-                       return 1;
+                       return rc;
                }
 
                depth++;
@@ -511,6 +1205,41 @@ static int lfsck_needs_scan_dir(const struct lu_env *env,
        return 0;
 }
 
+struct lfsck_thread_args *lfsck_thread_args_init(struct lfsck_instance *lfsck,
+                                                struct lfsck_component *com,
+                                                struct lfsck_start_param *lsp)
+{
+       struct lfsck_thread_args *lta;
+       int                       rc;
+
+       OBD_ALLOC_PTR(lta);
+       if (lta == NULL)
+               return ERR_PTR(-ENOMEM);
+
+       rc = lu_env_init(&lta->lta_env, LCT_MD_THREAD | LCT_DT_THREAD);
+       if (rc != 0) {
+               OBD_FREE_PTR(lta);
+               return ERR_PTR(rc);
+       }
+
+       lta->lta_lfsck = lfsck_instance_get(lfsck);
+       if (com != NULL)
+               lta->lta_com = lfsck_component_get(com);
+
+       lta->lta_lsp = lsp;
+
+       return lta;
+}
+
+void lfsck_thread_args_fini(struct lfsck_thread_args *lta)
+{
+       if (lta->lta_com != NULL)
+               lfsck_component_put(&lta->lta_env, lta->lta_com);
+       lfsck_instance_put(&lta->lta_env, lta->lta_lfsck);
+       lu_env_fini(&lta->lta_env);
+       OBD_FREE_PTR(lta);
+}
+
 /* LFSCK wrap functions */
 
 void lfsck_fail(const struct lu_env *env, struct lfsck_instance *lfsck,
@@ -526,7 +1255,8 @@ void lfsck_fail(const struct lu_env *env, struct lfsck_instance *lfsck,
 int lfsck_checkpoint(const struct lu_env *env, struct lfsck_instance *lfsck)
 {
        struct lfsck_component *com;
-       int                     rc;
+       int                     rc  = 0;
+       int                     rc1 = 0;
 
        if (likely(cfs_time_beforeq(cfs_time_current(),
                                    lfsck->li_time_next_checkpoint)))
@@ -536,16 +1266,17 @@ int lfsck_checkpoint(const struct lu_env *env, struct lfsck_instance *lfsck)
        cfs_list_for_each_entry(com, &lfsck->li_list_scan, lc_link) {
                rc = com->lc_ops->lfsck_checkpoint(env, com, false);
                if (rc != 0)
-                       return rc;;
+                       rc1 = rc;
        }
 
        lfsck->li_time_last_checkpoint = cfs_time_current();
        lfsck->li_time_next_checkpoint = lfsck->li_time_last_checkpoint +
                                cfs_time_seconds(LFSCK_CHECKPOINT_INTERVAL);
-       return 0;
+       return rc1 != 0 ? rc1 : rc;
 }
 
-int lfsck_prep(const struct lu_env *env, struct lfsck_instance *lfsck)
+int lfsck_prep(const struct lu_env *env, struct lfsck_instance *lfsck,
+              struct lfsck_start_param *lsp)
 {
        struct dt_object       *obj     = NULL;
        struct lfsck_component *com;
@@ -566,9 +1297,9 @@ int lfsck_prep(const struct lu_env *env, struct lfsck_instance *lfsck)
                if (lfsck->li_bookmark_ram.lb_param & LPF_DRYRUN)
                        com->lc_journal = 0;
 
-               rc = com->lc_ops->lfsck_prep(env, com);
+               rc = com->lc_ops->lfsck_prep(env, com, lsp);
                if (rc != 0)
-                       RETURN(rc);
+                       GOTO(out, rc);
 
                if ((pos == NULL) ||
                    (!lfsck_pos_is_zero(&com->lc_pos_start) &&
@@ -633,6 +1364,7 @@ int lfsck_prep(const struct lu_env *env, struct lfsck_instance *lfsck)
        }
 
        lfsck->li_obj_dir = lfsck_object_get(obj);
+       lfsck->li_cookie_dir = iops->store(env, di);
        spin_lock(&lfsck->li_lock);
        lfsck->li_di_dir = di;
        spin_unlock(&lfsck->li_lock);
@@ -707,6 +1439,7 @@ int lfsck_exec_oit(const struct lu_env *env, struct lfsck_instance *lfsck,
        }
 
        lfsck->li_obj_dir = lfsck_object_get(obj);
+       lfsck->li_cookie_dir = iops->store(env, di);
        spin_lock(&lfsck->li_lock);
        lfsck->li_di_dir = di;
        spin_unlock(&lfsck->li_lock);
@@ -738,64 +1471,248 @@ int lfsck_post(const struct lu_env *env, struct lfsck_instance *lfsck,
 {
        struct lfsck_component *com;
        struct lfsck_component *next;
-       int                     rc;
+       int                     rc  = 0;
+       int                     rc1 = 0;
 
        lfsck_pos_fill(env, lfsck, &lfsck->li_pos_current, false);
        cfs_list_for_each_entry_safe(com, next, &lfsck->li_list_scan, lc_link) {
                rc = com->lc_ops->lfsck_post(env, com, result, false);
                if (rc != 0)
-                       return rc;
+                       rc1 = rc;
        }
 
        lfsck->li_time_last_checkpoint = cfs_time_current();
        lfsck->li_time_next_checkpoint = lfsck->li_time_last_checkpoint +
                                cfs_time_seconds(LFSCK_CHECKPOINT_INTERVAL);
+
+       /* Ignore some component post failure to make other can go ahead. */
        return result;
 }
 
+static void lfsck_interpret(const struct lu_env *env,
+                           struct lfsck_instance *lfsck,
+                           struct ptlrpc_request *req, void *args, int result)
+{
+       struct lfsck_async_interpret_args *laia = args;
+       struct lfsck_component            *com;
+
+       LASSERT(laia->laia_com == NULL);
+       LASSERT(laia->laia_shared);
+
+       spin_lock(&lfsck->li_lock);
+       list_for_each_entry(com, &lfsck->li_list_scan, lc_link) {
+               if (com->lc_ops->lfsck_interpret != NULL) {
+                       laia->laia_com = com;
+                       com->lc_ops->lfsck_interpret(env, req, laia, result);
+               }
+       }
+
+       list_for_each_entry(com, &lfsck->li_list_double_scan, lc_link) {
+               if (com->lc_ops->lfsck_interpret != NULL) {
+                       laia->laia_com = com;
+                       com->lc_ops->lfsck_interpret(env, req, laia, result);
+               }
+       }
+       spin_unlock(&lfsck->li_lock);
+}
+
 int lfsck_double_scan(const struct lu_env *env, struct lfsck_instance *lfsck)
 {
        struct lfsck_component *com;
        struct lfsck_component *next;
-       int                     rc;
+       struct l_wait_info      lwi = { 0 };
+       int                     rc  = 0;
+       int                     rc1 = 0;
 
-       cfs_list_for_each_entry_safe(com, next, &lfsck->li_list_double_scan,
-                                    lc_link) {
+       list_for_each_entry(com, &lfsck->li_list_double_scan, lc_link) {
                if (lfsck->li_bookmark_ram.lb_param & LPF_DRYRUN)
                        com->lc_journal = 0;
 
                rc = com->lc_ops->lfsck_double_scan(env, com);
                if (rc != 0)
-                       return rc;
+                       rc1 = rc;
+       }
+
+       l_wait_event(lfsck->li_thread.t_ctl_waitq,
+                    atomic_read(&lfsck->li_double_scan_count) == 0,
+                    &lwi);
+
+       if (lfsck->li_status != LS_PAUSED &&
+           lfsck->li_status != LS_CO_PAUSED) {
+               list_for_each_entry_safe(com, next, &lfsck->li_list_double_scan,
+                                        lc_link) {
+                       spin_lock(&lfsck->li_lock);
+                       list_del_init(&com->lc_link);
+                       list_add_tail(&com->lc_link, &lfsck->li_list_idle);
+                       spin_unlock(&lfsck->li_lock);
+               }
+       }
+
+       return rc1 != 0 ? rc1 : rc;
+}
+
+static int lfsck_stop_notify(const struct lu_env *env,
+                            struct lfsck_instance *lfsck,
+                            struct lfsck_tgt_descs *ltds,
+                            struct lfsck_tgt_desc *ltd, __u16 type)
+{
+       struct ptlrpc_request_set *set;
+       struct lfsck_component    *com;
+       int                        rc  = 0;
+       ENTRY;
+
+       spin_lock(&lfsck->li_lock);
+       com = __lfsck_component_find(lfsck, type, &lfsck->li_list_scan);
+       if (com == NULL)
+               com = __lfsck_component_find(lfsck, type,
+                                            &lfsck->li_list_double_scan);
+       if (com != NULL)
+               lfsck_component_get(com);
+       spin_unlock(&lfsck->li_lock);
+
+       if (com != NULL) {
+               if (com->lc_ops->lfsck_stop_notify != NULL) {
+                       set = ptlrpc_prep_set();
+                       if (set == NULL) {
+                               lfsck_component_put(env, com);
+
+                               RETURN(-ENOMEM);
+                       }
+
+                       rc = com->lc_ops->lfsck_stop_notify(env, com, ltds,
+                                                           ltd, set);
+                       if (rc == 0)
+                               rc = ptlrpc_set_wait(set);
+
+                       ptlrpc_set_destroy(set);
+               }
+
+               lfsck_component_put(env, com);
+       }
+
+       RETURN(rc);
+}
+
+void lfsck_quit(const struct lu_env *env, struct lfsck_instance *lfsck)
+{
+       struct lfsck_component *com;
+       struct lfsck_component *next;
+
+       list_for_each_entry_safe(com, next, &lfsck->li_list_scan,
+                                lc_link) {
+               if (com->lc_ops->lfsck_quit != NULL)
+                       com->lc_ops->lfsck_quit(env, com);
+
+               spin_lock(&lfsck->li_lock);
+               list_del_init(&com->lc_link);
+               list_del_init(&com->lc_link_dir);
+               list_add_tail(&com->lc_link, &lfsck->li_list_idle);
+               spin_unlock(&lfsck->li_lock);
+       }
+
+       list_for_each_entry_safe(com, next, &lfsck->li_list_double_scan,
+                                lc_link) {
+               if (com->lc_ops->lfsck_quit != NULL)
+                       com->lc_ops->lfsck_quit(env, com);
+
+               spin_lock(&lfsck->li_lock);
+               list_del_init(&com->lc_link);
+               list_add_tail(&com->lc_link, &lfsck->li_list_idle);
+               spin_unlock(&lfsck->li_lock);
        }
+}
+
+static int lfsck_async_interpret(const struct lu_env *env,
+                                struct ptlrpc_request *req,
+                                void *args, int rc)
+{
+       struct lfsck_async_interpret_args *laia = args;
+       struct lfsck_instance             *lfsck;
+
+       lfsck = container_of0(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)
+               laia->laia_result = rc;
+
+       return 0;
+}
+
+int lfsck_async_request(const struct lu_env *env, struct obd_export *exp,
+                       struct lfsck_request *lr,
+                       struct ptlrpc_request_set *set,
+                       ptlrpc_interpterer_t interpreter,
+                       void *args, int request)
+{
+       struct lfsck_async_interpret_args *laia;
+       struct ptlrpc_request             *req;
+       struct lfsck_request              *tmp;
+       struct req_format                 *format;
+       int                                rc;
+
+       switch (request) {
+       case LFSCK_NOTIFY:
+               format = &RQF_LFSCK_NOTIFY;
+               break;
+       case LFSCK_QUERY:
+               format = &RQF_LFSCK_QUERY;
+               break;
+       default:
+               CDEBUG(D_LFSCK, "%s: unknown async request %d: rc = %d\n",
+                      exp->exp_obd->obd_name, request, -EINVAL);
+               return -EINVAL;
+       }
+
+       req = ptlrpc_request_alloc(class_exp2cliimp(exp), format);
+       if (req == NULL)
+               return -ENOMEM;
+
+       rc = ptlrpc_request_pack(req, LUSTRE_OBD_VERSION, request);
+       if (rc != 0) {
+               ptlrpc_request_free(req);
+
+               return rc;
+       }
+
+       tmp = req_capsule_client_get(&req->rq_pill, &RMF_LFSCK_REQUEST);
+       *tmp = *lr;
+       ptlrpc_request_set_replen(req);
+
+       laia = ptlrpc_req_async_args(req);
+       *laia = *(struct lfsck_async_interpret_args *)args;
+       if (laia->laia_com != NULL)
+               lfsck_component_get(laia->laia_com);
+       req->rq_interpret_reply = interpreter;
+       ptlrpc_set_add_req(set, req);
+
        return 0;
 }
 
 /* external interfaces */
 
-int lfsck_get_speed(struct dt_device *key, void *buf, int len)
+int lfsck_get_speed(struct seq_file *m, struct dt_device *key)
 {
        struct lu_env           env;
        struct lfsck_instance  *lfsck;
        int                     rc;
        ENTRY;
 
-       lfsck = lfsck_instance_find(key, true, false);
-       if (unlikely(lfsck == NULL))
-               RETURN(-ENODEV);
-
        rc = lu_env_init(&env, LCT_MD_THREAD | LCT_DT_THREAD);
        if (rc != 0)
-               GOTO(out, rc);
+               RETURN(rc);
 
-       rc = snprintf(buf, len, "%u\n", lfsck->li_bookmark_ram.lb_speed_limit);
-       lu_env_fini(&env);
+       lfsck = lfsck_instance_find(key, true, false);
+       if (likely(lfsck != NULL)) {
+               seq_printf(m, "%u\n", lfsck->li_bookmark_ram.lb_speed_limit);
+               lfsck_instance_put(&env, lfsck);
+       } else {
+               rc = -ENXIO;
+       }
 
-       GOTO(out, rc);
+       lu_env_fini(&env);
 
-out:
-       lfsck_instance_put(&env, lfsck);
-       return rc;
+       RETURN(rc);
 }
 EXPORT_SYMBOL(lfsck_get_speed);
 
@@ -806,79 +1723,305 @@ int lfsck_set_speed(struct dt_device *key, int val)
        int                     rc;
        ENTRY;
 
+       rc = lu_env_init(&env, LCT_MD_THREAD | LCT_DT_THREAD);
+       if (rc != 0)
+               RETURN(rc);
+
        lfsck = lfsck_instance_find(key, true, false);
-       if (unlikely(lfsck == NULL))
-               RETURN(-ENODEV);
+       if (likely(lfsck != NULL)) {
+               mutex_lock(&lfsck->li_mutex);
+               if (__lfsck_set_speed(lfsck, val))
+                       rc = lfsck_bookmark_store(&env, lfsck);
+               mutex_unlock(&lfsck->li_mutex);
+               lfsck_instance_put(&env, lfsck);
+       } else {
+               rc = -ENXIO;
+       }
+
+       lu_env_fini(&env);
+
+       RETURN(rc);
+}
+EXPORT_SYMBOL(lfsck_set_speed);
+
+int lfsck_get_windows(struct seq_file *m, struct dt_device *key)
+{
+       struct lu_env           env;
+       struct lfsck_instance  *lfsck;
+       int                     rc;
+       ENTRY;
 
        rc = lu_env_init(&env, LCT_MD_THREAD | LCT_DT_THREAD);
        if (rc != 0)
-               GOTO(out, rc);
+               RETURN(rc);
+
+       lfsck = lfsck_instance_find(key, true, false);
+       if (likely(lfsck != NULL)) {
+               seq_printf(m, "%u\n", lfsck->li_bookmark_ram.lb_async_windows);
+               lfsck_instance_put(&env, lfsck);
+       } else {
+               rc = -ENXIO;
+       }
 
-       mutex_lock(&lfsck->li_mutex);
-       __lfsck_set_speed(lfsck, val);
-       rc = lfsck_bookmark_store(&env, lfsck);
-       mutex_unlock(&lfsck->li_mutex);
        lu_env_fini(&env);
 
-       GOTO(out, rc);
+       RETURN(rc);
+}
+EXPORT_SYMBOL(lfsck_get_windows);
 
-out:
-       lfsck_instance_put(&env, lfsck);
-       return rc;
+int lfsck_set_windows(struct dt_device *key, int val)
+{
+       struct lu_env           env;
+       struct lfsck_instance  *lfsck;
+       int                     rc;
+       ENTRY;
+
+       rc = lu_env_init(&env, LCT_MD_THREAD | LCT_DT_THREAD);
+       if (rc != 0)
+               RETURN(rc);
+
+       lfsck = lfsck_instance_find(key, true, false);
+       if (likely(lfsck != NULL)) {
+               if (val > LFSCK_ASYNC_WIN_MAX) {
+                       CWARN("%s: Too large async window size, which "
+                             "may cause memory issues. The valid range "
+                             "is [0 - %u]. If you do not want to restrict "
+                             "the window size for async requests pipeline, "
+                             "just set it as 0.\n",
+                             lfsck_lfsck2name(lfsck), LFSCK_ASYNC_WIN_MAX);
+                       rc = -EINVAL;
+               } else if (lfsck->li_bookmark_ram.lb_async_windows != val) {
+                       mutex_lock(&lfsck->li_mutex);
+                       lfsck->li_bookmark_ram.lb_async_windows = val;
+                       rc = lfsck_bookmark_store(&env, lfsck);
+                       mutex_unlock(&lfsck->li_mutex);
+               }
+               lfsck_instance_put(&env, lfsck);
+       } else {
+               rc = -ENXIO;
+       }
+
+       lu_env_fini(&env);
+
+       RETURN(rc);
 }
-EXPORT_SYMBOL(lfsck_set_speed);
+EXPORT_SYMBOL(lfsck_set_windows);
 
-int lfsck_dump(struct dt_device *key, void *buf, int len, __u16 type)
+int lfsck_dump(struct seq_file *m, struct dt_device *key, enum lfsck_type type)
 {
        struct lu_env           env;
        struct lfsck_instance  *lfsck;
-       struct lfsck_component *com   = NULL;
+       struct lfsck_component *com;
        int                     rc;
        ENTRY;
 
+       rc = lu_env_init(&env, LCT_MD_THREAD | LCT_DT_THREAD);
+       if (rc != 0)
+               RETURN(rc);
+
        lfsck = lfsck_instance_find(key, true, false);
-       if (unlikely(lfsck == NULL))
-               RETURN(-ENODEV);
+       if (likely(lfsck != NULL)) {
+               com = lfsck_component_find(lfsck, type);
+               if (likely(com != NULL)) {
+                       rc = com->lc_ops->lfsck_dump(&env, com, m);
+                       lfsck_component_put(&env, com);
+               } else {
+                       rc = -ENOTSUPP;
+               }
+
+               lfsck_instance_put(&env, lfsck);
+       } else {
+               rc = -ENXIO;
+       }
+
+       lu_env_fini(&env);
+
+       RETURN(rc);
+}
+EXPORT_SYMBOL(lfsck_dump);
+
+static int lfsck_stop_all(const struct lu_env *env,
+                         struct lfsck_instance *lfsck,
+                         struct lfsck_stop *stop)
+{
+       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 ptlrpc_request_set         *set;
+       struct lfsck_tgt_descs            *ltds   = &lfsck->li_mdt_descs;
+       struct lfsck_tgt_desc             *ltd;
+       struct lfsck_bookmark             *bk     = &lfsck->li_bookmark_ram;
+       __u32                              idx;
+       int                                rc     = 0;
+       int                                rc1    = 0;
+       ENTRY;
+
+       LASSERT(stop->ls_flags & LPF_BROADCAST);
+
+       set = ptlrpc_prep_set();
+       if (unlikely(set == NULL))
+               RETURN(-ENOMEM);
+
+       memset(lr, 0, sizeof(*lr));
+       lr->lr_event = LE_STOP;
+       lr->lr_index = lfsck_dev_idx(lfsck->li_bottom);
+       lr->lr_status = stop->ls_status;
+       lr->lr_version = bk->lb_version;
+       lr->lr_active = LFSCK_TYPES_ALL;
+       lr->lr_param = stop->ls_flags;
+
+       laia->laia_com = NULL;
+       laia->laia_ltds = ltds;
+       laia->laia_lr = lr;
+       laia->laia_result = 0;
+       laia->laia_shared = 1;
+
+       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;
+               rc = lfsck_async_request(env, ltd->ltd_exp, lr, set,
+                                        lfsck_async_interpret, laia,
+                                        LFSCK_NOTIFY);
+               if (rc != 0) {
+                       lfsck_interpret(env, lfsck, NULL, laia, rc);
+                       lfsck_tgt_put(ltd);
+                       CERROR("%s: cannot notify MDT %x for LFSCK stop: "
+                              "rc = %d\n", lfsck_lfsck2name(lfsck), idx, rc);
+                       rc1 = rc;
+               }
+       }
+       up_read(&ltds->ltd_rw_sem);
+
+       rc = ptlrpc_set_wait(set);
+       ptlrpc_set_destroy(set);
+
+       if (rc == 0)
+               rc = laia->laia_result;
+
+       if (rc == -EALREADY)
+               rc = 0;
+
+       if (rc != 0)
+               CERROR("%s: fail to stop LFSCK on some MDTs: rc = %d\n",
+                      lfsck_lfsck2name(lfsck), rc);
+
+       RETURN(rc != 0 ? rc : rc1);
+}
+
+static int lfsck_start_all(const struct lu_env *env,
+                          struct lfsck_instance *lfsck,
+                          struct lfsck_start *start)
+{
+       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 ptlrpc_request_set         *set;
+       struct lfsck_tgt_descs            *ltds   = &lfsck->li_mdt_descs;
+       struct lfsck_tgt_desc             *ltd;
+       struct lfsck_bookmark             *bk     = &lfsck->li_bookmark_ram;
+       __u32                              idx;
+       int                                rc     = 0;
+       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->li_bottom);
+       lr->lr_speed = bk->lb_speed_limit;
+       lr->lr_version = bk->lb_version;
+       lr->lr_active = start->ls_active;
+       lr->lr_param = start->ls_flags;
+       lr->lr_async_windows = bk->lb_async_windows;
+       lr->lr_valid = LSV_SPEED_LIMIT | LSV_ERROR_HANDLE | LSV_DRYRUN |
+                      LSV_ASYNC_WINDOWS;
+
+       laia->laia_com = NULL;
+       laia->laia_ltds = ltds;
+       laia->laia_lr = lr;
+       laia->laia_result = 0;
+       laia->laia_shared = 1;
+
+       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;
+               ltd->ltd_layout_done = 0;
+               rc = lfsck_async_request(env, ltd->ltd_exp, lr, set,
+                                        lfsck_async_interpret, laia,
+                                        LFSCK_NOTIFY);
+               if (rc != 0) {
+                       lfsck_interpret(env, lfsck, NULL, laia, rc);
+                       lfsck_tgt_put(ltd);
+                       CERROR("%s: cannot notify MDT %x for LFSCK "
+                              "start, failout: rc = %d\n",
+                              lfsck_lfsck2name(lfsck), idx, rc);
+                       break;
+               }
+       }
+       up_read(&ltds->ltd_rw_sem);
+
+       if (rc != 0) {
+               ptlrpc_set_destroy(set);
+
+               RETURN(rc);
+       }
 
-       com = lfsck_component_find(lfsck, type);
-       if (com == NULL)
-               GOTO(out, rc = -ENOTSUPP);
+       rc = ptlrpc_set_wait(set);
+       ptlrpc_set_destroy(set);
 
-       rc = lu_env_init(&env, LCT_MD_THREAD | LCT_DT_THREAD);
-       if (rc != 0)
-               GOTO(out, rc);
+       if (rc == 0)
+               rc = laia->laia_result;
 
-       rc = com->lc_ops->lfsck_dump(&env, com, buf, len);
-       lu_env_fini(&env);
+       if (rc != 0) {
+               struct lfsck_stop *stop = &info->lti_stop;
 
-       GOTO(out, rc);
+               CERROR("%s: cannot start LFSCK on some MDTs, "
+                      "stop all: rc = %d\n",
+                      lfsck_lfsck2name(lfsck), rc);
+               if (rc != -EALREADY) {
+                       stop->ls_status = LS_FAILED;
+                       stop->ls_flags = LPF_ALL_TGT | LPF_BROADCAST;
+                       lfsck_stop_all(env, lfsck, stop);
+               }
+       }
 
-out:
-       if (com != NULL)
-               lfsck_component_put(&env, com);
-       lfsck_instance_put(&env, lfsck);
-       return rc;
+       RETURN(rc);
 }
-EXPORT_SYMBOL(lfsck_dump);
 
 int lfsck_start(const struct lu_env *env, struct dt_device *key,
                struct lfsck_start_param *lsp)
 {
-       struct lfsck_start     *start  = lsp->lsp_start;
-       struct lfsck_instance  *lfsck;
-       struct lfsck_bookmark  *bk;
-       struct ptlrpc_thread   *thread;
-       struct lfsck_component *com;
-       struct l_wait_info      lwi    = { 0 };
-       bool                    dirty  = false;
-       int                     rc     = 0;
-       __u16                   valid  = 0;
-       __u16                   flags  = 0;
+       struct lfsck_start              *start  = lsp->lsp_start;
+       struct lfsck_instance           *lfsck;
+       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;
+       int                              rc     = 0;
+       __u16                            valid  = 0;
+       __u16                            flags  = 0;
+       __u16                            type   = 1;
        ENTRY;
 
        lfsck = lfsck_instance_find(key, true, false);
        if (unlikely(lfsck == NULL))
-               RETURN(-ENODEV);
+               RETURN(-ENXIO);
+
+       /* System is not ready, try again later. */
+       if (unlikely(lfsck->li_namespace == NULL))
+               GOTO(put, rc = -EAGAIN);
 
        /* start == NULL means auto trigger paused LFSCK. */
        if ((start == NULL) &&
@@ -891,15 +2034,44 @@ int lfsck_start(const struct lu_env *env, struct dt_device *key,
        mutex_lock(&lfsck->li_mutex);
        spin_lock(&lfsck->li_lock);
        if (!thread_is_init(thread) && !thread_is_stopped(thread)) {
+               rc = -EALREADY;
+               if (unlikely(start == NULL)) {
+                       spin_unlock(&lfsck->li_lock);
+                       GOTO(out, rc);
+               }
+
+               while (start->ls_active != 0) {
+                       if (!(type & start->ls_active)) {
+                               type <<= 1;
+                               continue;
+                       }
+
+                       com = __lfsck_component_find(lfsck, type,
+                                                    &lfsck->li_list_scan);
+                       if (com == NULL)
+                               com = __lfsck_component_find(lfsck, type,
+                                               &lfsck->li_list_double_scan);
+                       if (com == NULL) {
+                               rc = -EOPNOTSUPP;
+                               break;
+                       }
+
+                       if (com->lc_ops->lfsck_join != NULL) {
+                               rc = com->lc_ops->lfsck_join( env, com, lsp);
+                               if (rc != 0 && rc != -EALREADY)
+                                       break;
+                       }
+                       start->ls_active &= ~type;
+                       type <<= 1;
+               }
                spin_unlock(&lfsck->li_lock);
-               GOTO(out, rc = -EALREADY);
+               GOTO(out, rc);
        }
-
        spin_unlock(&lfsck->li_lock);
 
-       lfsck->li_namespace = lsp->lsp_namespace;
-       lfsck->li_paused = 0;
+       lfsck->li_status = 0;
        lfsck->li_oit_over = 0;
+       lfsck->li_start_unplug = 0;
        lfsck->li_drop_dryrun = 0;
        lfsck->li_new_scanned = 0;
 
@@ -907,53 +2079,17 @@ int lfsck_start(const struct lu_env *env, struct dt_device *key,
        if (start == NULL)
                goto trigger;
 
-       start->ls_version = bk->lb_version;
-       if (start->ls_valid & LSV_SPEED_LIMIT) {
-               __lfsck_set_speed(lfsck, start->ls_speed_limit);
-               dirty = true;
-       }
-
-       if (start->ls_valid & LSV_ERROR_HANDLE) {
-               valid |= DOIV_ERROR_HANDLE;
-               if (start->ls_flags & LPF_FAILOUT)
-                       flags |= DOIF_FAILOUT;
-
-               if ((start->ls_flags & LPF_FAILOUT) &&
-                   !(bk->lb_param & LPF_FAILOUT)) {
-                       bk->lb_param |= LPF_FAILOUT;
-                       dirty = true;
-               } else if (!(start->ls_flags & LPF_FAILOUT) &&
-                          (bk->lb_param & LPF_FAILOUT)) {
-                       bk->lb_param &= ~LPF_FAILOUT;
-                       dirty = true;
-               }
-       }
-
-       if (start->ls_valid & LSV_DRYRUN) {
-               if ((start->ls_flags & LPF_DRYRUN) &&
-                   !(bk->lb_param & LPF_DRYRUN)) {
-                       bk->lb_param |= LPF_DRYRUN;
-                       dirty = true;
-               } else if (!(start->ls_flags & LPF_DRYRUN) &&
-                          (bk->lb_param & LPF_DRYRUN)) {
-                       bk->lb_param &= ~LPF_DRYRUN;
-                       lfsck->li_drop_dryrun = 1;
-                       dirty = true;
-               }
-       }
+       if (start->ls_flags & LPF_BROADCAST && !lfsck->li_master) {
+               CERROR("%s: only allow to specify '-A | -o' via MDS\n",
+                      lfsck_lfsck2name(lfsck));
 
-       if (dirty) {
-               rc = lfsck_bookmark_store(env, lfsck);
-               if (rc != 0)
-                       GOTO(out, rc);
+               GOTO(out, rc = -EPERM);
        }
 
-       if (start->ls_flags & LPF_RESET)
-               flags |= DOIF_RESET;
+       start->ls_version = bk->lb_version;
 
        if (start->ls_active != 0) {
                struct lfsck_component *next;
-               __u16 type = 1;
 
                if (start->ls_active == LFSCK_TYPES_ALL)
                        start->ls_active = LFSCK_TYPES_SUPPORTED;
@@ -963,8 +2099,8 @@ int lfsck_start(const struct lu_env *env, struct dt_device *key,
                        GOTO(out, rc = -ENOTSUPP);
                }
 
-               cfs_list_for_each_entry_safe(com, next,
-                                            &lfsck->li_list_scan, lc_link) {
+               list_for_each_entry_safe(com, next,
+                                        &lfsck->li_list_scan, lc_link) {
                        if (!(com->lc_type & start->ls_active)) {
                                rc = com->lc_ops->lfsck_post(env, com, 0,
                                                             false);
@@ -981,9 +2117,9 @@ int lfsck_start(const struct lu_env *env, struct dt_device *key,
                                        /* The component status will be updated
                                         * when its prep() is called later by
                                         * the LFSCK main engine. */
-                                       cfs_list_del_init(&com->lc_link);
-                                       cfs_list_add_tail(&com->lc_link,
-                                                         &lfsck->li_list_scan);
+                                       list_del_init(&com->lc_link);
+                                       list_add_tail(&com->lc_link,
+                                                     &lfsck->li_list_scan);
                                }
                                start->ls_active &= ~type;
                        }
@@ -991,7 +2127,28 @@ int lfsck_start(const struct lu_env *env, struct dt_device *key,
                }
        }
 
-       cfs_list_for_each_entry(com, &lfsck->li_list_scan, lc_link) {
+       if (list_empty(&lfsck->li_list_scan)) {
+               /* The speed limit will be used to control both the LFSCK and
+                * low layer scrub (if applied), need to be handled firstly. */
+               if (start->ls_valid & LSV_SPEED_LIMIT) {
+                       if (__lfsck_set_speed(lfsck, start->ls_speed_limit)) {
+                               rc = lfsck_bookmark_store(env, lfsck);
+                               if (rc != 0)
+                                       GOTO(out, rc);
+                       }
+               }
+
+               goto trigger;
+       }
+
+       if (start->ls_flags & LPF_RESET)
+               flags |= DOIF_RESET;
+
+       rc = lfsck_set_param(env, lfsck, start, !!(flags & DOIF_RESET));
+       if (rc != 0)
+               GOTO(out, rc);
+
+       list_for_each_entry(com, &lfsck->li_list_scan, lc_link) {
                start->ls_active |= com->lc_type;
                if (flags & DOIF_RESET) {
                        rc = com->lc_ops->lfsck_reset(env, com, false);
@@ -1005,85 +2162,260 @@ trigger:
        if (bk->lb_param & LPF_DRYRUN)
                lfsck->li_args_dir |= LUDA_VERIFY_DRYRUN;
 
-       if (bk->lb_param & LPF_FAILOUT) {
+       if (start != NULL && start->ls_valid & LSV_ERROR_HANDLE) {
                valid |= DOIV_ERROR_HANDLE;
-               flags |= DOIF_FAILOUT;
+               if (start->ls_flags & LPF_FAILOUT)
+                       flags |= DOIF_FAILOUT;
+       }
+
+       if (start != NULL && start->ls_valid & LSV_DRYRUN) {
+               valid |= DOIV_DRYRUN;
+               if (start->ls_flags & LPF_DRYRUN)
+                       flags |= DOIF_DRYRUN;
        }
 
-       if (!cfs_list_empty(&lfsck->li_list_scan))
+       if (!list_empty(&lfsck->li_list_scan))
                flags |= DOIF_OUTUSED;
 
        lfsck->li_args_oit = (flags << DT_OTABLE_IT_FLAGS_SHIFT) | valid;
        thread_set_flags(thread, 0);
-       if (lfsck->li_master)
-               rc = cfs_create_thread(lfsck_master_engine, lfsck, 0);
-       if (rc < 0)
-               CERROR("%s: cannot start LFSCK thread, rc = %d\n",
+       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);
+       task = kthread_run(lfsck_master_engine, lta, "lfsck");
+       if (IS_ERR(task)) {
+               rc = PTR_ERR(task);
+               CERROR("%s: cannot start LFSCK thread: rc = %d\n",
                       lfsck_lfsck2name(lfsck), rc);
-       else
-               l_wait_event(thread->t_ctl_waitq,
-                            thread_is_running(thread) ||
-                            thread_is_stopped(thread),
-                            &lwi);
+               lfsck_thread_args_fini(lta);
 
-       GOTO(out, rc = 0);
+               GOTO(out, rc);
+       }
+
+       l_wait_event(thread->t_ctl_waitq,
+                    thread_is_running(thread) ||
+                    thread_is_stopped(thread),
+                    &lwi);
+       if (start == NULL || !(start->ls_flags & LPF_BROADCAST)) {
+               lfsck->li_start_unplug = 1;
+               wake_up_all(&thread->t_ctl_waitq);
+
+               GOTO(out, rc = 0);
+       }
+
+       /* release lfsck::li_mutex to avoid deadlock. */
+       mutex_unlock(&lfsck->li_mutex);
+       rc = lfsck_start_all(env, lfsck, start);
+       if (rc != 0) {
+               spin_lock(&lfsck->li_lock);
+               if (thread_is_stopped(thread)) {
+                       spin_unlock(&lfsck->li_lock);
+               } else {
+                       lfsck->li_status = LS_FAILED;
+                       lfsck->li_flags = 0;
+                       thread_set_flags(thread, SVC_STOPPING);
+                       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);
+               }
+       } else {
+               lfsck->li_start_unplug = 1;
+               wake_up_all(&thread->t_ctl_waitq);
+       }
+
+       GOTO(put, rc);
 
 out:
        mutex_unlock(&lfsck->li_mutex);
+
 put:
        lfsck_instance_put(env, lfsck);
-       return (rc < 0 ? rc : 0);
+
+       return rc < 0 ? rc : 0;
 }
 EXPORT_SYMBOL(lfsck_start);
 
-int lfsck_stop(const struct lu_env *env, struct dt_device *key, bool pause)
+int lfsck_stop(const struct lu_env *env, struct dt_device *key,
+              struct lfsck_stop *stop)
 {
        struct lfsck_instance   *lfsck;
        struct ptlrpc_thread    *thread;
        struct l_wait_info       lwi    = { 0 };
+       int                      rc     = 0;
+       int                      rc1    = 0;
        ENTRY;
 
        lfsck = lfsck_instance_find(key, true, false);
        if (unlikely(lfsck == NULL))
-               RETURN(-ENODEV);
+               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);
+       }
+
        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);
-               mutex_unlock(&lfsck->li_mutex);
-               lfsck_instance_put(env, lfsck);
-               RETURN(-EALREADY);
+               GOTO(out, rc = 0);
+       }
+
+       if (stop != NULL) {
+               lfsck->li_status = stop->ls_status;
+               lfsck->li_flags = stop->ls_flags;
+       } else {
+               lfsck->li_status = LS_STOPPED;
+               lfsck->li_flags = 0;
        }
 
-       if (pause)
-               lfsck->li_paused = 1;
        thread_set_flags(thread, SVC_STOPPING);
-       /* The LFSCK thread may be sleeping on low layer wait queue,
-        * wake it up. */
-       if (likely(lfsck->li_di_oit != NULL))
-               lfsck->li_obj_oit->do_index_ops->dio_it.put(env,
-                                                           lfsck->li_di_oit);
        spin_unlock(&lfsck->li_lock);
 
-       cfs_waitq_broadcast(&thread->t_ctl_waitq);
+       wake_up_all(&thread->t_ctl_waitq);
        l_wait_event(thread->t_ctl_waitq,
                     thread_is_stopped(thread),
                     &lwi);
+
+       GOTO(out, rc = 0);
+
+out:
        mutex_unlock(&lfsck->li_mutex);
        lfsck_instance_put(env, lfsck);
 
-       RETURN(0);
+       return rc != 0 ? rc : rc1;
 }
 EXPORT_SYMBOL(lfsck_stop);
 
+int lfsck_in_notify(const struct lu_env *env, struct dt_device *key,
+                   struct lfsck_request *lr)
+{
+       int rc = -EOPNOTSUPP;
+       ENTRY;
+
+       switch (lr->lr_event) {
+       case LE_START: {
+               struct lfsck_start       *start = &lfsck_env_info(env)->lti_start;
+               struct lfsck_start_param  lsp;
+
+               memset(start, 0, sizeof(*start));
+               start->ls_valid = lr->lr_valid;
+               start->ls_speed_limit = lr->lr_speed;
+               start->ls_version = lr->lr_version;
+               start->ls_active = lr->lr_active;
+               start->ls_flags = lr->lr_param & ~LPF_BROADCAST;
+               start->ls_async_windows = lr->lr_async_windows;
+
+               lsp.lsp_start = start;
+               lsp.lsp_index = lr->lr_index;
+               lsp.lsp_index_valid = 1;
+               rc = lfsck_start(env, key, &lsp);
+               break;
+       }
+       case LE_STOP: {
+               struct lfsck_stop *stop = &lfsck_env_info(env)->lti_stop;
+
+               memset(stop, 0, sizeof(*stop));
+               stop->ls_status = lr->lr_status;
+               stop->ls_flags = lr->lr_param & ~LPF_BROADCAST;
+               rc = lfsck_stop(env, key, stop);
+               break;
+       }
+       case LE_PHASE1_DONE:
+       case LE_PHASE2_DONE:
+       case LE_FID_ACCESSED:
+       case LE_PEER_EXIT:
+       case LE_CONDITIONAL_DESTROY:
+       case LE_PAIRS_VERIFY: {
+               struct lfsck_instance  *lfsck;
+               struct lfsck_component *com;
+
+               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_in_notify(env, com, lr);
+                       lfsck_component_put(env, com);
+               }
+
+               lfsck_instance_put(env, lfsck);
+               break;
+       }
+       default:
+               break;
+       }
+
+       RETURN(rc);
+}
+EXPORT_SYMBOL(lfsck_in_notify);
+
+int lfsck_query(const struct lu_env *env, struct dt_device *key,
+               struct lfsck_request *lr)
+{
+       struct lfsck_instance  *lfsck;
+       struct lfsck_component *com;
+       int                     rc;
+       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);
+       } else {
+               rc = -ENOTSUPP;
+       }
+
+       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)
+{
+       struct lfsck_instance  *lfsck;
+       int                     rc      = -ENXIO;
+
+       lfsck = lfsck_instance_find(key, true, false);
+       if (likely(lfsck != NULL)) {
+               lfsck->li_namespace = ns;
+               lfsck_instance_put(env, lfsck);
+               rc = 0;
+       }
+
+       return rc;
+}
+EXPORT_SYMBOL(lfsck_register_namespace);
+
 int lfsck_register(const struct lu_env *env, struct dt_device *key,
-                  struct dt_device *next, bool master)
+                  struct dt_device *next, struct obd_device *obd,
+                  lfsck_out_notify notify, void *notify_data, bool master)
 {
        struct lfsck_instance   *lfsck;
-       struct dt_object        *root;
-       struct dt_object        *obj;
+       struct dt_object        *root  = NULL;
+       struct dt_object        *obj   = NULL;
        struct lu_fid           *fid   = &lfsck_env_info(env)->lti_fid;
        int                      rc;
        ENTRY;
@@ -1104,14 +2436,26 @@ int lfsck_register(const struct lu_env *env, struct dt_device *key,
        CFS_INIT_LIST_HEAD(&lfsck->li_list_double_scan);
        CFS_INIT_LIST_HEAD(&lfsck->li_list_idle);
        atomic_set(&lfsck->li_ref, 1);
-       cfs_waitq_init(&lfsck->li_thread.t_ctl_waitq);
+       atomic_set(&lfsck->li_double_scan_count, 0);
+       init_waitqueue_head(&lfsck->li_thread.t_ctl_waitq);
+       lfsck->li_out_notify = notify;
+       lfsck->li_out_notify_data = notify_data;
        lfsck->li_next = next;
        lfsck->li_bottom = key;
+       lfsck->li_obd = obd;
+
+       rc = lfsck_tgt_descs_init(&lfsck->li_ost_descs);
+       if (rc != 0)
+               GOTO(out, rc);
+
+       rc = lfsck_tgt_descs_init(&lfsck->li_mdt_descs);
+       if (rc != 0)
+               GOTO(out, rc);
 
        fid->f_seq = FID_SEQ_LOCAL_NAME;
        fid->f_oid = 1;
        fid->f_ver = 0;
-       rc = local_oid_storage_init(env, lfsck->li_bottom, fid, &lfsck->li_los);
+       rc = local_oid_storage_init(env, key, fid, &lfsck->li_los);
        if (rc != 0)
                GOTO(out, rc);
 
@@ -1119,54 +2463,111 @@ int lfsck_register(const struct lu_env *env, struct dt_device *key,
        if (rc != 0)
                GOTO(out, rc);
 
-       root = dt_locate(env, lfsck->li_bottom, fid);
+       root = dt_locate(env, key, fid);
        if (IS_ERR(root))
                GOTO(out, rc = PTR_ERR(root));
 
-       lfsck->li_local_root = root;
-        dt_try_as_dir(env, 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;
-               if (lfsck_dev_idx(lfsck->li_bottom) == 0) {
+               if (lfsck_dev_idx(key) == 0) {
+                       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", BYPASS_CAPA);
                        if (rc != 0)
                                GOTO(out, rc);
+
+                       obj = dt_locate(env, key, &lfsck->li_global_root_fid);
+                       if (IS_ERR(obj))
+                               GOTO(out, rc = PTR_ERR(obj));
+
+                       rc = dt_lookup(env, obj, (struct dt_rec *)fid,
+                               (const struct dt_key *)dotlustre, BYPASS_CAPA);
+                       if (rc != 0)
+                               GOTO(out, rc);
+
+                       lu_object_put(env, &obj->do_lu);
+                       obj = dt_locate(env, key, fid);
+                       if (IS_ERR(obj))
+                               GOTO(out, rc = PTR_ERR(obj));
+
+                       cname = lfsck_name_get_const(env, dotlustre,
+                                                    strlen(dotlustre));
+                       rc = lfsck_verify_linkea(env, key, obj, cname,
+                                                &lfsck->li_global_root_fid);
+                       if (rc != 0)
+                               GOTO(out, rc);
+
+                       *pfid = *fid;
+                       rc = dt_lookup(env, obj, (struct dt_rec *)fid,
+                                      (const struct dt_key *)lostfound,
+                                      BYPASS_CAPA);
+                       if (rc != 0)
+                               GOTO(out, rc);
+
+                       lu_object_put(env, &obj->do_lu);
+                       obj = dt_locate(env, key, fid);
+                       if (IS_ERR(obj))
+                               GOTO(out, rc = PTR_ERR(obj));
+
+                       cname = lfsck_name_get_const(env, lostfound,
+                                                    strlen(lostfound));
+                       rc = lfsck_verify_linkea(env, key, obj, cname, pfid);
+                       if (rc != 0)
+                               GOTO(out, rc);
+
+                       lu_object_put(env, &obj->do_lu);
+                       obj = NULL;
                }
        }
 
        fid->f_seq = FID_SEQ_LOCAL_FILE;
        fid->f_oid = OTABLE_IT_OID;
        fid->f_ver = 0;
-       obj = dt_locate(env, lfsck->li_bottom, fid);
+       obj = dt_locate(env, key, fid);
        if (IS_ERR(obj))
                GOTO(out, rc = PTR_ERR(obj));
 
+       lu_object_get(&obj->do_lu);
        lfsck->li_obj_oit = obj;
        rc = obj->do_ops->do_index_try(env, obj, &dt_otable_features);
-       if (rc != 0) {
-               if (rc == -ENOTSUPP)
-                       GOTO(add, rc = 0);
-
+       if (rc != 0)
                GOTO(out, rc);
-       }
 
        rc = lfsck_bookmark_setup(env, lfsck);
        if (rc != 0)
                GOTO(out, rc);
 
        if (master) {
+               rc = lfsck_fid_init(lfsck);
+               if (rc < 0)
+                       GOTO(out, rc);
+
                rc = lfsck_namespace_setup(env, lfsck);
                if (rc < 0)
                        GOTO(out, rc);
        }
 
+       rc = lfsck_layout_setup(env, lfsck);
+       if (rc < 0)
+               GOTO(out, rc);
+
        /* XXX: more LFSCK components initialization to be added here. */
 
-add:
        rc = lfsck_instance_add(lfsck);
+       if (rc == 0)
+               rc = lfsck_add_target_from_orphan(env, lfsck);
 out:
+       if (obj != NULL && !IS_ERR(obj))
+               lu_object_put(env, &obj->do_lu);
+       if (root != NULL && !IS_ERR(root))
+               lu_object_put(env, &root->do_lu);
        if (rc != 0)
                lfsck_instance_cleanup(env, lfsck);
        return rc;
@@ -1183,19 +2584,167 @@ void lfsck_degister(const struct lu_env *env, struct dt_device *key)
 }
 EXPORT_SYMBOL(lfsck_degister);
 
+int lfsck_add_target(const struct lu_env *env, struct dt_device *key,
+                    struct dt_device *tgt, struct obd_export *exp,
+                    __u32 index, bool for_ost)
+{
+       struct lfsck_instance   *lfsck;
+       struct lfsck_tgt_desc   *ltd;
+       int                      rc;
+       ENTRY;
+
+       OBD_ALLOC_PTR(ltd);
+       if (ltd == NULL)
+               RETURN(-ENOMEM);
+
+       ltd->ltd_tgt = tgt;
+       ltd->ltd_key = key;
+       ltd->ltd_exp = exp;
+       INIT_LIST_HEAD(&ltd->ltd_orphan_list);
+       INIT_LIST_HEAD(&ltd->ltd_layout_list);
+       INIT_LIST_HEAD(&ltd->ltd_layout_phase_list);
+       atomic_set(&ltd->ltd_ref, 1);
+       ltd->ltd_index = index;
+
+       spin_lock(&lfsck_instance_lock);
+       lfsck = __lfsck_instance_find(key, true, false);
+       if (lfsck == NULL) {
+               if (for_ost)
+                       list_add_tail(&ltd->ltd_orphan_list,
+                                     &lfsck_ost_orphan_list);
+               else
+                       list_add_tail(&ltd->ltd_orphan_list,
+                                     &lfsck_mdt_orphan_list);
+               spin_unlock(&lfsck_instance_lock);
+
+               RETURN(0);
+       }
+       spin_unlock(&lfsck_instance_lock);
+
+       rc = __lfsck_add_target(env, lfsck, ltd, for_ost, false);
+       if (rc != 0)
+               lfsck_tgt_put(ltd);
+
+       lfsck_instance_put(env, lfsck);
+
+       RETURN(rc);
+}
+EXPORT_SYMBOL(lfsck_add_target);
+
+void lfsck_del_target(const struct lu_env *env, struct dt_device *key,
+                     struct dt_device *tgt, __u32 index, bool for_ost)
+{
+       struct lfsck_instance   *lfsck;
+       struct lfsck_tgt_descs  *ltds;
+       struct lfsck_tgt_desc   *ltd;
+       struct list_head        *head;
+
+       if (for_ost)
+               head = &lfsck_ost_orphan_list;
+       else
+               head = &lfsck_mdt_orphan_list;
+
+       spin_lock(&lfsck_instance_lock);
+       list_for_each_entry(ltd, head, ltd_orphan_list) {
+               if (ltd->ltd_tgt == tgt) {
+                       list_del_init(&ltd->ltd_orphan_list);
+                       spin_unlock(&lfsck_instance_lock);
+                       lfsck_tgt_put(ltd);
+
+                       return;
+               }
+       }
+
+       ltd = NULL;
+       lfsck = __lfsck_instance_find(key, true, false);
+       spin_unlock(&lfsck_instance_lock);
+       if (unlikely(lfsck == NULL))
+               return;
+
+       if (for_ost)
+               ltds = &lfsck->li_ost_descs;
+       else
+               ltds = &lfsck->li_mdt_descs;
+
+       down_write(&ltds->ltd_rw_sem);
+       LASSERT(ltds->ltd_tgts_bitmap != NULL);
+
+       if (unlikely(index >= ltds->ltd_tgts_bitmap->size))
+               goto unlock;
+
+       ltd = LTD_TGT(ltds, index);
+       if (unlikely(ltd == NULL))
+               goto unlock;
+
+       LASSERT(ltds->ltd_tgtnr > 0);
+
+       ltds->ltd_tgtnr--;
+       cfs_bitmap_clear(ltds->ltd_tgts_bitmap, index);
+       LTD_TGT(ltds, index) = NULL;
+
+unlock:
+       if (ltd == NULL) {
+               if (for_ost)
+                       head = &lfsck->li_ost_descs.ltd_orphan;
+               else
+                       head = &lfsck->li_mdt_descs.ltd_orphan;
+
+               list_for_each_entry(ltd, head, ltd_orphan_list) {
+                       if (ltd->ltd_tgt == tgt) {
+                               list_del_init(&ltd->ltd_orphan_list);
+                               break;
+                       }
+               }
+       }
+
+       up_write(&ltds->ltd_rw_sem);
+       if (ltd != NULL) {
+               spin_lock(&ltds->ltd_lock);
+               ltd->ltd_dead = 1;
+               spin_unlock(&ltds->ltd_lock);
+               lfsck_stop_notify(env, lfsck, ltds, ltd, LFSCK_TYPE_LAYOUT);
+               lfsck_tgt_put(ltd);
+       }
+
+       lfsck_instance_put(env, lfsck);
+}
+EXPORT_SYMBOL(lfsck_del_target);
+
 static int __init lfsck_init(void)
 {
        int rc;
 
+       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) {
+               tgt_register_lfsck_in_notify(lfsck_in_notify);
+               tgt_register_lfsck_query(lfsck_query);
+       }
+
        return rc;
 }
 
 static void __exit lfsck_exit(void)
 {
+       struct lfsck_tgt_desc *ltd;
+       struct lfsck_tgt_desc *next;
+
        LASSERT(cfs_list_empty(&lfsck_instance_list));
 
+       list_for_each_entry_safe(ltd, next, &lfsck_ost_orphan_list,
+                                ltd_orphan_list) {
+               list_del_init(&ltd->ltd_orphan_list);
+               lfsck_tgt_put(ltd);
+       }
+
+       list_for_each_entry_safe(ltd, next, &lfsck_mdt_orphan_list,
+                                ltd_orphan_list) {
+               list_del_init(&ltd->ltd_orphan_list);
+               lfsck_tgt_put(ltd);
+       }
+
        lu_context_key_degister(&lfsck_thread_key);
 }