Whamcloud - gitweb
LU-6066 lfsck: handle file's nlink attribute properly
[fs/lustre-release.git] / lustre / lfsck / lfsck_namespace.c
index 4b1a48e..5a5eb48 100644 (file)
@@ -20,7 +20,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2012, 2013, Intel Corporation.
+ * Copyright (c) 2013, 2014, Intel Corporation.
  */
 /*
  * lustre/lfsck/lfsck_namespace.c
@@ -64,8 +64,8 @@ lfsck_namespace_assistant_req_init(struct lfsck_instance *lfsck,
                return ERR_PTR(-ENOMEM);
 
        INIT_LIST_HEAD(&lnr->lnr_lar.lar_list);
-       lu_object_get(&lfsck->li_obj_dir->do_lu);
-       lnr->lnr_obj = lfsck->li_obj_dir;
+       lnr->lnr_obj = lfsck_object_get(lfsck->li_obj_dir);
+       lnr->lnr_lmv = lfsck_lmv_get(lfsck->li_lmv);
        lnr->lnr_fid = ent->lde_fid;
        lnr->lnr_oit_cookie = lfsck->li_pos_current.lp_oit_cookie;
        lnr->lnr_dir_cookie = ent->lde_hash;
@@ -84,6 +84,9 @@ static void lfsck_namespace_assistant_req_fini(const struct lu_env *env,
        struct lfsck_namespace_req *lnr =
                        container_of0(lar, struct lfsck_namespace_req, lnr_lar);
 
+       if (lnr->lnr_lmv != NULL)
+               lfsck_lmv_put(env, lnr->lnr_lmv);
+
        lu_object_put(env, &lnr->lnr_obj->do_lu);
        OBD_FREE(lnr, lnr->lnr_size);
 }
@@ -116,7 +119,6 @@ static void lfsck_namespace_le_to_cpu(struct lfsck_namespace *dst,
                                le64_to_cpu(src->ln_objs_repaired_phase2);
        dst->ln_objs_failed_phase2 = le64_to_cpu(src->ln_objs_failed_phase2);
        dst->ln_objs_nlink_repaired = le64_to_cpu(src->ln_objs_nlink_repaired);
-       dst->ln_objs_lost_found = le64_to_cpu(src->ln_objs_lost_found);
        fid_le_to_cpu(&dst->ln_fid_latest_scanned_phase2,
                      &src->ln_fid_latest_scanned_phase2);
        dst->ln_dirent_repaired = le64_to_cpu(src->ln_dirent_repaired);
@@ -130,6 +132,32 @@ static void lfsck_namespace_le_to_cpu(struct lfsck_namespace *dst,
        dst->ln_dangling_repaired = le64_to_cpu(src->ln_dangling_repaired);
        dst->ln_mul_ref_repaired = le64_to_cpu(src->ln_mul_ref_repaired);
        dst->ln_bad_type_repaired = le64_to_cpu(src->ln_bad_type_repaired);
+       dst->ln_lost_dirent_repaired =
+                               le64_to_cpu(src->ln_lost_dirent_repaired);
+       dst->ln_striped_dirs_scanned =
+                               le64_to_cpu(src->ln_striped_dirs_scanned);
+       dst->ln_striped_dirs_repaired =
+                               le64_to_cpu(src->ln_striped_dirs_repaired);
+       dst->ln_striped_dirs_failed =
+                               le64_to_cpu(src->ln_striped_dirs_failed);
+       dst->ln_striped_dirs_disabled =
+                               le64_to_cpu(src->ln_striped_dirs_disabled);
+       dst->ln_striped_dirs_skipped =
+                               le64_to_cpu(src->ln_striped_dirs_skipped);
+       dst->ln_striped_shards_scanned =
+                               le64_to_cpu(src->ln_striped_shards_scanned);
+       dst->ln_striped_shards_repaired =
+                               le64_to_cpu(src->ln_striped_shards_repaired);
+       dst->ln_striped_shards_failed =
+                               le64_to_cpu(src->ln_striped_shards_failed);
+       dst->ln_striped_shards_skipped =
+                               le64_to_cpu(src->ln_striped_shards_skipped);
+       dst->ln_name_hash_repaired = le64_to_cpu(src->ln_name_hash_repaired);
+       dst->ln_local_lpf_scanned = le64_to_cpu(src->ln_local_lpf_scanned);
+       dst->ln_local_lpf_moved = le64_to_cpu(src->ln_local_lpf_moved);
+       dst->ln_local_lpf_skipped = le64_to_cpu(src->ln_local_lpf_skipped);
+       dst->ln_local_lpf_failed = le64_to_cpu(src->ln_local_lpf_failed);
+       dst->ln_bitmap_size = le32_to_cpu(src->ln_bitmap_size);
 }
 
 static void lfsck_namespace_cpu_to_le(struct lfsck_namespace *dst,
@@ -160,7 +188,6 @@ static void lfsck_namespace_cpu_to_le(struct lfsck_namespace *dst,
                                cpu_to_le64(src->ln_objs_repaired_phase2);
        dst->ln_objs_failed_phase2 = cpu_to_le64(src->ln_objs_failed_phase2);
        dst->ln_objs_nlink_repaired = cpu_to_le64(src->ln_objs_nlink_repaired);
-       dst->ln_objs_lost_found = cpu_to_le64(src->ln_objs_lost_found);
        fid_cpu_to_le(&dst->ln_fid_latest_scanned_phase2,
                      &src->ln_fid_latest_scanned_phase2);
        dst->ln_dirent_repaired = cpu_to_le64(src->ln_dirent_repaired);
@@ -174,6 +201,32 @@ static void lfsck_namespace_cpu_to_le(struct lfsck_namespace *dst,
        dst->ln_dangling_repaired = cpu_to_le64(src->ln_dangling_repaired);
        dst->ln_mul_ref_repaired = cpu_to_le64(src->ln_mul_ref_repaired);
        dst->ln_bad_type_repaired = cpu_to_le64(src->ln_bad_type_repaired);
+       dst->ln_lost_dirent_repaired =
+                               cpu_to_le64(src->ln_lost_dirent_repaired);
+       dst->ln_striped_dirs_scanned =
+                               cpu_to_le64(src->ln_striped_dirs_scanned);
+       dst->ln_striped_dirs_repaired =
+                               cpu_to_le64(src->ln_striped_dirs_repaired);
+       dst->ln_striped_dirs_failed =
+                               cpu_to_le64(src->ln_striped_dirs_failed);
+       dst->ln_striped_dirs_disabled =
+                               cpu_to_le64(src->ln_striped_dirs_disabled);
+       dst->ln_striped_dirs_skipped =
+                               cpu_to_le64(src->ln_striped_dirs_skipped);
+       dst->ln_striped_shards_scanned =
+                               cpu_to_le64(src->ln_striped_shards_scanned);
+       dst->ln_striped_shards_repaired =
+                               cpu_to_le64(src->ln_striped_shards_repaired);
+       dst->ln_striped_shards_failed =
+                               cpu_to_le64(src->ln_striped_shards_failed);
+       dst->ln_striped_shards_skipped =
+                               cpu_to_le64(src->ln_striped_shards_skipped);
+       dst->ln_name_hash_repaired = cpu_to_le64(src->ln_name_hash_repaired);
+       dst->ln_local_lpf_scanned = cpu_to_le64(src->ln_local_lpf_scanned);
+       dst->ln_local_lpf_moved = cpu_to_le64(src->ln_local_lpf_moved);
+       dst->ln_local_lpf_skipped = cpu_to_le64(src->ln_local_lpf_skipped);
+       dst->ln_local_lpf_failed = cpu_to_le64(src->ln_local_lpf_failed);
+       dst->ln_bitmap_size = cpu_to_le32(src->ln_bitmap_size);
 }
 
 static void lfsck_namespace_record_failure(const struct lu_env *env,
@@ -198,9 +251,87 @@ static void lfsck_namespace_record_failure(const struct lu_env *env,
 }
 
 /**
- * \retval +ve: the lfsck_namespace is broken, the caller should reset it.
- * \retval 0: succeed.
- * \retval -ve: failed cases.
+ * Load the MDT bitmap from the lfsck_namespace trace file.
+ *
+ * \param[in] env      pointer to the thread context
+ * \param[in] com      pointer to the lfsck component
+ *
+ * \retval             0 for success
+ * \retval             negative error number on failure or data corruption
+ */
+static int lfsck_namespace_load_bitmap(const struct lu_env *env,
+                                      struct lfsck_component *com)
+{
+       struct dt_object                *obj    = com->lc_obj;
+       struct lfsck_assistant_data     *lad    = com->lc_data;
+       struct lfsck_namespace          *ns     = com->lc_file_ram;
+       cfs_bitmap_t                    *bitmap = lad->lad_bitmap;
+       ssize_t                          size;
+       __u32                            nbits;
+       int                              rc;
+       ENTRY;
+
+       if (com->lc_lfsck->li_mdt_descs.ltd_tgts_bitmap->size >
+           ns->ln_bitmap_size)
+               nbits = com->lc_lfsck->li_mdt_descs.ltd_tgts_bitmap->size;
+       else
+               nbits = ns->ln_bitmap_size;
+
+       if (unlikely(nbits < BITS_PER_LONG))
+               nbits = BITS_PER_LONG;
+
+       if (nbits > bitmap->size) {
+               __u32 new_bits = bitmap->size;
+               cfs_bitmap_t *new_bitmap;
+
+               while (new_bits < nbits)
+                       new_bits <<= 1;
+
+               new_bitmap = CFS_ALLOCATE_BITMAP(new_bits);
+               if (new_bitmap == NULL)
+                       RETURN(-ENOMEM);
+
+               lad->lad_bitmap = new_bitmap;
+               CFS_FREE_BITMAP(bitmap);
+               bitmap = new_bitmap;
+       }
+
+       if (ns->ln_bitmap_size == 0) {
+               lad->lad_incomplete = 0;
+               CFS_RESET_BITMAP(bitmap);
+
+               RETURN(0);
+       }
+
+       size = (ns->ln_bitmap_size + 7) >> 3;
+       rc = dt_xattr_get(env, obj,
+                         lfsck_buf_get(env, bitmap->data, size),
+                         XATTR_NAME_LFSCK_BITMAP, BYPASS_CAPA);
+       if (rc != size)
+               RETURN(rc >= 0 ? -EINVAL : rc);
+
+       if (cfs_bitmap_check_empty(bitmap))
+               lad->lad_incomplete = 0;
+       else
+               lad->lad_incomplete = 1;
+
+       RETURN(0);
+}
+
+/**
+ * Load namespace LFSCK statistics information from the trace file.
+ *
+ * For old release (Lustre-2.6 or older), the statistics information was
+ * stored as XATTR_NAME_LFSCK_NAMESPACE_OLD EA. But in Lustre-2.7, we need
+ * more statistics information. To avoid confusing old MDT when downgrade,
+ * Lustre-2.7 stores the namespace LFSCK statistics information as new
+ * XATTR_NAME_LFSCK_NAMESPACE EA.
+ *
+ * \param[in] env      pointer to the thread context
+ * \param[in] com      pointer to the lfsck component
+ *
+ * \retval             0 for success
+ * \retval             negative error number on failure
  */
 static int lfsck_namespace_load(const struct lu_env *env,
                                struct lfsck_component *com)
@@ -220,7 +351,7 @@ static int lfsck_namespace_load(const struct lu_env *env,
                        CDEBUG(D_LFSCK, "%s: invalid lfsck_namespace magic "
                               "%#x != %#x\n", lfsck_lfsck2name(com->lc_lfsck),
                               ns->ln_magic, LFSCK_NAMESPACE_MAGIC);
-                       rc = 1;
+                       rc = -ESTALE;
                } else {
                        rc = 0;
                }
@@ -229,23 +360,48 @@ static int lfsck_namespace_load(const struct lu_env *env,
                       "expected = %d: rc = %d\n",
                       lfsck_lfsck2name(com->lc_lfsck), len, rc);
                if (rc >= 0)
-                       rc = 1;
+                       rc = -ESTALE;
+       } else {
+               /* Check whether it is old trace file or not.
+                * If yes, it should be reset via returning -ESTALE. */
+               rc = dt_xattr_get(env, com->lc_obj,
+                                 lfsck_buf_get(env, com->lc_file_disk, len),
+                                 XATTR_NAME_LFSCK_NAMESPACE_OLD, BYPASS_CAPA);
+               if (rc >= 0)
+                       rc = -ESTALE;
        }
+
        return rc;
 }
 
 static int lfsck_namespace_store(const struct lu_env *env,
                                 struct lfsck_component *com, bool init)
 {
-       struct dt_object        *obj    = com->lc_obj;
-       struct lfsck_instance   *lfsck  = com->lc_lfsck;
-       struct thandle          *handle;
-       int                      len    = com->lc_file_size;
-       int                      rc;
+       struct dt_object                *obj    = com->lc_obj;
+       struct lfsck_instance           *lfsck  = com->lc_lfsck;
+       struct lfsck_namespace          *ns     = com->lc_file_ram;
+       struct lfsck_assistant_data     *lad    = com->lc_data;
+       cfs_bitmap_t                    *bitmap = NULL;
+       struct thandle                  *handle;
+       __u32                            nbits  = 0;
+       int                              len    = com->lc_file_size;
+       int                              rc;
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 8, 53, 0)
+       struct lu_buf            tbuf   = { &len, sizeof(len) };
+#endif
        ENTRY;
 
+       if (lad != NULL) {
+               bitmap = lad->lad_bitmap;
+               nbits = bitmap->size;
+
+               LASSERT(nbits > 0);
+               LASSERTF((nbits & 7) == 0, "Invalid nbits %u\n", nbits);
+       }
+
+       ns->ln_bitmap_size = nbits;
        lfsck_namespace_cpu_to_le((struct lfsck_namespace *)com->lc_file_disk,
-                                 (struct lfsck_namespace *)com->lc_file_ram);
+                                 ns);
        handle = dt_trans_create(env, lfsck->li_bottom);
        if (IS_ERR(handle))
                GOTO(log, rc = PTR_ERR(handle));
@@ -256,15 +412,47 @@ static int lfsck_namespace_store(const struct lu_env *env,
        if (rc != 0)
                GOTO(out, rc);
 
+       if (bitmap != NULL) {
+               rc = dt_declare_xattr_set(env, obj,
+                               lfsck_buf_get(env, bitmap->data, nbits >> 3),
+                               XATTR_NAME_LFSCK_BITMAP, 0, handle);
+               if (rc != 0)
+                       GOTO(out, rc);
+       }
+
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 8, 53, 0)
+       /* To be compatible with old Lustre-2.x MDT (x <= 6), generate dummy
+        * XATTR_NAME_LFSCK_NAMESPACE_OLD EA, then when downgrade to Lustre-2.x,
+        * the old LFSCK will find "invalid" XATTR_NAME_LFSCK_NAMESPACE_OLD EA,
+        * then reset the namespace LFSCK trace file. */
+       if (init) {
+               rc = dt_declare_xattr_set(env, obj, &tbuf,
+                                         XATTR_NAME_LFSCK_NAMESPACE_OLD,
+                                         LU_XATTR_CREATE, handle);
+               if (rc != 0)
+                       GOTO(out, rc);
+       }
+#endif
+
        rc = dt_trans_start_local(env, lfsck->li_bottom, handle);
        if (rc != 0)
                GOTO(out, rc);
 
        rc = dt_xattr_set(env, obj,
                          lfsck_buf_get(env, com->lc_file_disk, len),
-                         XATTR_NAME_LFSCK_NAMESPACE,
-                         init ? LU_XATTR_CREATE : LU_XATTR_REPLACE,
-                         handle, BYPASS_CAPA);
+                         XATTR_NAME_LFSCK_NAMESPACE, 0, handle, BYPASS_CAPA);
+       if (rc == 0 && bitmap != NULL)
+               rc = dt_xattr_set(env, obj,
+                                 lfsck_buf_get(env, bitmap->data, nbits >> 3),
+                                 XATTR_NAME_LFSCK_BITMAP, 0, handle,
+                                 BYPASS_CAPA);
+
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 8, 53, 0)
+       if (rc == 0 && init)
+               rc = dt_xattr_set(env, obj, &tbuf,
+                                 XATTR_NAME_LFSCK_NAMESPACE_OLD,
+                                 LU_XATTR_CREATE, handle, BYPASS_CAPA);
+#endif
 
        GOTO(out, rc);
 
@@ -294,12 +482,12 @@ static int lfsck_namespace_init(const struct lu_env *env,
 }
 
 /**
- * Update the namespace LFSCK tracing file for the given @fid
+ * Update the namespace LFSCK trace file for the given @fid
  *
  * \param[in] env      pointer to the thread context
  * \param[in] com      pointer to the lfsck component
  * \param[in] fid      the fid which flags to be updated in the lfsck
- *                     tracing file
+ *                     trace file
  * \param[in] add      true if add new flags, otherwise remove flags
  *
  * \retval             0 for succeed or nothing to be done
@@ -392,7 +580,7 @@ log:
                dt_trans_stop(env, dev, th);
 
        CDEBUG(D_LFSCK, "%s: namespace LFSCK %s flags for "DFID" in the "
-              "tracing file, flags %x, old %x, new %x: rc = %d\n",
+              "trace file, flags %x, old %x, new %x: rc = %d\n",
               lfsck_lfsck2name(lfsck), add ? "add" : "del", PFID(fid),
               (__u32)flags, (__u32)old, (__u32)new, rc);
 
@@ -402,9 +590,9 @@ unlock:
        return rc;
 }
 
-static int lfsck_namespace_check_exist(const struct lu_env *env,
-                                      struct dt_object *dir,
-                                      struct dt_object *obj, const char *name)
+int lfsck_namespace_check_exist(const struct lu_env *env,
+                               struct dt_object *dir,
+                               struct dt_object *obj, const char *name)
 {
        struct lu_fid    *fid = &lfsck_env_info(env)->lti_fid;
        int               rc;
@@ -624,6 +812,8 @@ static int lfsck_namespace_filter_linkea_entry(struct linkea_data *ldata,
  *  type "O":          The MDT-object has no linkEA, and there is no name
  *                     entry that references the MDT-object.
  *
+ *  type "S":          The orphan MDT-object is a shard of a striped directory
+ *
  * \see lfsck_layout_recreate_parent() for more types.
  *
  * The orphan name will be like:
@@ -646,6 +836,7 @@ static int lfsck_namespace_insert_orphan(const struct lu_env *env,
        struct lu_name                  *cname  = &info->lti_name;
        struct dt_insert_rec            *rec    = &info->lti_dt_rec;
        struct lu_fid                   *tfid   = &info->lti_fid5;
+       struct lu_attr                  *la     = &info->lti_la3;
        const struct lu_fid             *cfid   = lfsck_dto2fid(orphan);
        const struct lu_fid             *pfid;
        struct lfsck_instance           *lfsck  = com->lc_lfsck;
@@ -749,6 +940,13 @@ static int lfsck_namespace_insert_orphan(const struct lu_env *env,
                }
        }
 
+       memset(la, 0, sizeof(*la));
+       la->la_ctime = cfs_time_current_sec();
+       la->la_valid = LA_CTIME;
+       rc = dt_declare_attr_set(env, orphan, la, th);
+       if (rc != 0)
+               GOTO(stop, rc);
+
        rc = dt_trans_start_local(env, dev, th);
        if (rc != 0)
                GOTO(stop, rc);
@@ -799,6 +997,9 @@ static int lfsck_namespace_insert_orphan(const struct lu_env *env,
                }
        }
 
+       if (rc == 0)
+               rc = dt_attr_set(env, orphan, la, th, BYPASS_CAPA);
+
        GOTO(stop, rc = (rc == 0 ? 1 : rc));
 
 unlock:
@@ -824,644 +1025,640 @@ log:
        return rc;
 }
 
-static int lfsck_namespace_insert_normal(const struct lu_env *env,
-                                        struct lfsck_component *com,
-                                        struct dt_object *parent,
-                                        struct dt_object *child,
-                                        const char *name)
-{
-       /* XXX: TBD */
-       return 0;
-}
-
-static int lfsck_namespace_create_orphan(const struct lu_env *env,
-                                        struct lfsck_component *com,
-                                        struct dt_object *orphan)
-{
-       /* XXX: TBD */
-       return 0;
-}
-
 /**
- * Remove the specified entry from the linkEA.
+ * Add the specified name entry back to namespace.
  *
- * Locate the linkEA entry with the given @cname and @pfid, then
- * remove this entry or the other entries those are repeated with
- * this entry.
+ * If there is a linkEA entry that back references a name entry under
+ * some parent directory, but such parent directory does not have the
+ * claimed name entry. On the other hand, the linkEA entries count is
+ * not larger than the MDT-object's hard link count. Under such case,
+ * it is quite possible that the name entry is lost. Then the LFSCK
+ * should add the name entry back to the namespace.
  *
  * \param[in] env      pointer to the thread context
  * \param[in] com      pointer to the lfsck component
- * \param[in] obj      pointer to the dt_object to be handled
- * \param[in,out]ldata  pointer to the buffer that holds the linkEA
- * \param[in] cname    the name for the child in the parent directory
- * \param[in] pfid     the parent directory's FID for the linkEA
- * \param[in] next     if true, then remove the first found linkEA
- *                     entry, and move the ldata->ld_lee to next entry
+ * \param[in] parent   pointer to the directory under which the name entry
+ *                     will be inserted into
+ * \param[in] child    pointer to the object referenced by the name entry
+ *                     that to be inserted into the parent
+ * \param[in] name     the name for the child in the parent directory
  *
  * \retval             positive number for repaired cases
  * \retval             0 if nothing to be repaired
  * \retval             negative error number on failure
  */
-static int lfsck_namespace_shrink_linkea(const struct lu_env *env,
+static int lfsck_namespace_insert_normal(const struct lu_env *env,
                                         struct lfsck_component *com,
-                                        struct dt_object *obj,
-                                        struct linkea_data *ldata,
-                                        struct lu_name *cname,
-                                        struct lu_fid *pfid,
-                                        bool next)
+                                        struct dt_object *parent,
+                                        struct dt_object *child,
+                                        const char *name)
 {
-       struct lfsck_instance           *lfsck     = com->lc_lfsck;
-       struct dt_device                *dev       = lfsck->li_bottom;
-       struct lfsck_bookmark           *bk        = &lfsck->li_bookmark_ram;
-       struct thandle                  *th        = NULL;
-       struct lustre_handle             lh        = { 0 };
-       struct linkea_data               ldata_new = { 0 };
-       struct lu_buf                    linkea_buf;
-       int                              rc        = 0;
+       struct lfsck_thread_info        *info   = lfsck_env_info(env);
+       struct lu_attr                  *la     = &info->lti_la;
+       struct dt_insert_rec            *rec    = &info->lti_dt_rec;
+       struct lfsck_instance           *lfsck  = com->lc_lfsck;
+       struct dt_device                *dev    = lfsck->li_next;
+       struct thandle                  *th     = NULL;
+       struct lustre_handle             lh     = { 0 };
+       int                              rc     = 0;
        ENTRY;
 
-       rc = lfsck_ibits_lock(env, lfsck, obj, &lh,
-                             MDS_INODELOCK_UPDATE |
-                             MDS_INODELOCK_XATTR, LCK_EX);
+       if (unlikely(!dt_try_as_dir(env, parent)))
+               GOTO(log, rc = -ENOTDIR);
+
+       if (lfsck->li_bookmark_ram.lb_param & LPF_DRYRUN)
+               GOTO(log, rc = 1);
+
+       /* Hold update lock on the parent to prevent others to access. */
+       rc = lfsck_ibits_lock(env, lfsck, parent, &lh,
+                             MDS_INODELOCK_UPDATE, LCK_EX);
        if (rc != 0)
                GOTO(log, rc);
 
-       if (next)
-               linkea_del_buf(ldata, cname);
-       else
-               lfsck_namespace_filter_linkea_entry(ldata, cname, pfid,
-                                                   true);
-       lfsck_buf_init(&linkea_buf, ldata->ld_buf->lb_buf,
-                      ldata->ld_leh->leh_len);
-
-again:
        th = dt_trans_create(env, dev);
        if (IS_ERR(th))
-               GOTO(unlock1, rc = PTR_ERR(th));
+               GOTO(unlock, rc = PTR_ERR(th));
 
-       rc = dt_declare_xattr_set(env, obj, &linkea_buf,
-                                 XATTR_NAME_LINK, 0, th);
+       rec->rec_type = lfsck_object_type(child) & S_IFMT;
+       rec->rec_fid = lfsck_dto2fid(child);
+       rc = dt_declare_insert(env, parent, (const struct dt_rec *)rec,
+                              (const struct dt_key *)name, th);
        if (rc != 0)
                GOTO(stop, rc);
 
-       rc = dt_trans_start_local(env, dev, th);
+       if (S_ISDIR(rec->rec_type)) {
+               rc = dt_declare_ref_add(env, parent, th);
+               if (rc != 0)
+                       GOTO(stop, rc);
+       }
+
+       memset(la, 0, sizeof(*la));
+       la->la_ctime = cfs_time_current_sec();
+       la->la_valid = LA_CTIME;
+       rc = dt_declare_attr_set(env, parent, la, th);
        if (rc != 0)
                GOTO(stop, rc);
 
-       dt_write_lock(env, obj, 0);
-       if (unlikely(lfsck_is_dead_obj(obj)))
-               GOTO(unlock2, rc = -ENOENT);
-
-       rc = lfsck_links_read2(env, obj, &ldata_new);
+       rc = dt_declare_attr_set(env, child, la, th);
        if (rc != 0)
-               GOTO(unlock2, rc);
+               GOTO(stop, rc);
 
-       /* The specified linkEA entry has been removed by race. */
-       rc = linkea_links_find(&ldata_new, cname, pfid);
+       rc = dt_trans_start_local(env, dev, th);
        if (rc != 0)
-               GOTO(unlock2, rc = 0);
-
-       if (bk->lb_param & LPF_DRYRUN)
-               GOTO(unlock2, rc = 1);
+               GOTO(stop, rc);
 
-       if (next)
-               linkea_del_buf(&ldata_new, cname);
-       else
-               lfsck_namespace_filter_linkea_entry(&ldata_new, cname, pfid,
-                                                   true);
+       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);
 
-       if (linkea_buf.lb_len < ldata_new.ld_leh->leh_len) {
-               dt_write_unlock(env, obj);
-               dt_trans_stop(env, dev, th);
-               lfsck_buf_init(&linkea_buf, ldata_new.ld_buf->lb_buf,
-                              ldata_new.ld_leh->leh_len);
-               goto again;
+       if (S_ISDIR(rec->rec_type)) {
+               dt_write_lock(env, parent, 0);
+               rc = dt_ref_add(env, parent, th);
+               dt_write_unlock(env, parent);
+               if (rc != 0)
+                       GOTO(stop, rc);
        }
 
-       lfsck_buf_init(&linkea_buf, ldata_new.ld_buf->lb_buf,
-                      ldata_new.ld_leh->leh_len);
-       rc = dt_xattr_set(env, obj, &linkea_buf,
-                         XATTR_NAME_LINK, 0, th, BYPASS_CAPA);
+       la->la_ctime = cfs_time_current_sec();
+       rc = dt_attr_set(env, parent, la, th, BYPASS_CAPA);
+       if (rc != 0)
+               GOTO(stop, rc);
 
-       GOTO(unlock2, rc = (rc == 0 ? 1 : rc));
+       rc = dt_attr_set(env, child, la, th, BYPASS_CAPA);
 
-unlock2:
-       dt_write_unlock(env, obj);
+       GOTO(stop, rc = (rc == 0 ? 1 : rc));
 
 stop:
        dt_trans_stop(env, dev, th);
 
-unlock1:
+unlock:
        lfsck_ibits_unlock(&lh, LCK_EX);
 
 log:
-       CDEBUG(D_LFSCK, "%s: namespace LFSCK remove %s linkEA entry "
-              "for the object: "DFID", parent "DFID", name %.*s\n",
-              lfsck_lfsck2name(lfsck), next ? "invalid" : "redundant",
-              PFID(lfsck_dto2fid(obj)), PFID(pfid), cname->ln_namelen,
-              cname->ln_name);
+       CDEBUG(D_LFSCK, "%s: namespace LFSCK insert object "DFID" with "
+              "the name %s and type %o to the parent "DFID": rc = %d\n",
+              lfsck_lfsck2name(lfsck), PFID(lfsck_dto2fid(child)), name,
+              lfsck_object_type(child) & S_IFMT,
+              PFID(lfsck_dto2fid(parent)), rc);
 
        if (rc != 0) {
                struct lfsck_namespace *ns = com->lc_file_ram;
 
                ns->ln_flags |= LF_INCONSISTENT;
+               if (rc > 0)
+                       ns->ln_lost_dirent_repaired++;
        }
 
        return rc;
 }
 
 /**
- * Conditionally remove the specified entry from the linkEA.
+ * Create the specified orphan MDT-object on remote MDT.
  *
- * Take the parent lock firstly, then check whether the specified
- * name entry exists or not: if yes, do nothing; otherwise, call
- * lfsck_namespace_shrink_linkea() to remove the linkea entry.
+ * The LFSCK instance on this MDT will send LFSCK RPC to remote MDT to
+ * ask the remote LFSCK instance to create the specified orphan object
+ * under .lustre/lost+found/MDTxxxx/ directory with the name:
+ * ${FID}-P-${conflict_version}.
  *
  * \param[in] env      pointer to the thread context
  * \param[in] com      pointer to the lfsck component
- * \param[in] parent   pointer to the parent directory
- * \param[in] child    pointer to the child object that holds the linkEA
- * \param[in,out]ldata  pointer to the buffer that holds the linkEA
- * \param[in] cname    the name for the child in the parent directory
- * \param[in] pfid     the parent directory's FID for the linkEA
+ * \param[in] orphan   pointer to the orphan MDT-object
+ * \param[in] type     the orphan's type to be created
+ *
+ *  type "P":          The orphan object to be created was a parent directory
+ *                     of some MDT-object which linkEA shows that the @orphan
+ *                     object is missing.
+ *
+ * \see lfsck_layout_recreate_parent() for more types.
+ *
+ * \param[in] lmv      pointer to master LMV EA that will be set to the orphan
  *
  * \retval             positive number for repaired cases
- * \retval             0 if nothing to be repaired
+ * \retval             0 if needs to repair nothing
  * \retval             negative error number on failure
  */
-static int lfsck_namespace_shrink_linkea_cond(const struct lu_env *env,
-                                             struct lfsck_component *com,
-                                             struct dt_object *parent,
-                                             struct dt_object *child,
-                                             struct linkea_data *ldata,
-                                             struct lu_name *cname,
-                                             struct lu_fid *pfid)
+static int lfsck_namespace_create_orphan_remote(const struct lu_env *env,
+                                               struct lfsck_component *com,
+                                               struct dt_object *orphan,
+                                               __u32 type,
+                                               struct lmv_mds_md_v1 *lmv)
 {
-       struct lu_fid           *cfid   = &lfsck_env_info(env)->lti_fid3;
-       struct lustre_handle     lh     = { 0 };
-       int                      rc;
+       struct lfsck_thread_info        *info   = lfsck_env_info(env);
+       struct lfsck_request            *lr     = &info->lti_lr;
+       struct lu_seq_range             *range  = &info->lti_range;
+       const struct lu_fid             *fid    = lfsck_dto2fid(orphan);
+       struct lfsck_namespace          *ns     = com->lc_file_ram;
+       struct lfsck_instance           *lfsck  = com->lc_lfsck;
+       struct seq_server_site          *ss     =
+                       lu_site2seq(lfsck->li_bottom->dd_lu_dev.ld_site);
+       struct lfsck_tgt_desc           *ltd    = NULL;
+       struct ptlrpc_request           *req    = NULL;
+       int                              rc;
        ENTRY;
 
-       rc = lfsck_ibits_lock(env, com->lc_lfsck, parent, &lh,
-                             MDS_INODELOCK_UPDATE, LCK_EX);
+       if (lfsck->li_bookmark_ram.lb_param & LPF_DRYRUN)
+               GOTO(out, rc = 1);
+
+       fld_range_set_mdt(range);
+       rc = fld_server_lookup(env, ss->ss_server_fld, fid_seq(fid), range);
        if (rc != 0)
-               RETURN(rc);
+               GOTO(out, rc);
 
-       dt_read_lock(env, parent, 0);
-       if (unlikely(lfsck_is_dead_obj(parent))) {
-               dt_read_unlock(env, parent);
-               lfsck_ibits_unlock(&lh, LCK_EX);
-               rc = lfsck_namespace_shrink_linkea(env, com, child, ldata,
-                                                  cname, pfid, true);
+       ltd = lfsck_tgt_get(&lfsck->li_mdt_descs, range->lsr_index);
+       if (ltd == NULL) {
+               ns->ln_flags |= LF_INCOMPLETE;
 
-               RETURN(rc);
+               GOTO(out, rc = -ENODEV);
        }
 
-       rc = dt_lookup(env, parent, (struct dt_rec *)cfid,
-                      (const struct dt_key *)cname->ln_name,
-                      BYPASS_CAPA);
-       dt_read_unlock(env, parent);
+       req = ptlrpc_request_alloc(class_exp2cliimp(ltd->ltd_exp),
+                                  &RQF_LFSCK_NOTIFY);
+       if (req == NULL)
+               GOTO(out, rc = -ENOMEM);
 
-       /* It is safe to release the ldlm lock, because when the logic come
-        * here, we have got all the needed information above whether the
-        * linkEA entry is valid or not. It is not important that others
-        * may add new linkEA entry after the ldlm lock released. If other
-        * has removed the specified linkEA entry by race, then it is OK,
-        * because the subsequent lfsck_namespace_shrink_linkea() can handle
-        * such case. */
-       lfsck_ibits_unlock(&lh, LCK_EX);
-       if (rc == -ENOENT) {
-               rc = lfsck_namespace_shrink_linkea(env, com, child, ldata,
-                                                  cname, pfid, true);
+       rc = ptlrpc_request_pack(req, LUSTRE_OBD_VERSION, LFSCK_NOTIFY);
+       if (rc != 0) {
+               ptlrpc_request_free(req);
 
-               RETURN(rc);
+               GOTO(out, rc);
        }
 
-       if (rc != 0)
-               RETURN(rc);
+       lr = req_capsule_client_get(&req->rq_pill, &RMF_LFSCK_REQUEST);
+       memset(lr, 0, sizeof(*lr));
+       lr->lr_event = LE_CREATE_ORPHAN;
+       lr->lr_index = lfsck_dev_idx(lfsck->li_bottom);
+       lr->lr_active = LFSCK_TYPE_NAMESPACE;
+       lr->lr_fid = *fid;
+       lr->lr_type = type;
+       if (lmv != NULL) {
+               lr->lr_hash_type = lmv->lmv_hash_type;
+               lr->lr_stripe_count = lmv->lmv_stripe_count;
+               lr->lr_layout_version = lmv->lmv_layout_version;
+               memcpy(lr->lr_pool_name, lmv->lmv_pool_name,
+                      sizeof(lr->lr_pool_name));
+       }
 
-       /* The LFSCK just found some internal status of cross-MDTs
-        * create operation. That is normal. */
-       if (lu_fid_eq(cfid, lfsck_dto2fid(child))) {
-               linkea_next_entry(ldata);
+       ptlrpc_request_set_replen(req);
+       rc = ptlrpc_queue_wait(req);
+       ptlrpc_req_finished(req);
 
-               RETURN(0);
+       if (rc == 0) {
+               orphan->do_lu.lo_header->loh_attr |= LOHA_EXISTS;
+               rc = 1;
+       } else if (rc == -EEXIST) {
+               orphan->do_lu.lo_header->loh_attr |= LOHA_EXISTS;
+               rc = 0;
        }
 
-       rc = lfsck_namespace_shrink_linkea(env, com, child, ldata, cname,
-                                          pfid, true);
+       GOTO(out, rc);
 
-       RETURN(rc);
+out:
+       CDEBUG(D_LFSCK, "%s: namespace LFSCK create object "
+              DFID" on the MDT %x remotely: rc = %d\n",
+              lfsck_lfsck2name(lfsck), PFID(fid),
+              ltd != NULL ? ltd->ltd_index : -1, rc);
+
+       if (ltd != NULL)
+               lfsck_tgt_put(ltd);
+
+       return rc;
 }
 
 /**
- * Conditionally replace name entry in the parent.
+ * Create the specified orphan MDT-object locally.
  *
- * As required, the LFSCK may re-create the lost MDT-object for dangling
- * name entry, but such repairing may be wrong because of bad FID in the
- * name entry. As the LFSCK processing, the real MDT-object may be found,
- * then the LFSCK should check whether the former re-created MDT-object
- * has been modified or not, if not, then destroy it and update the name
- * entry in the parent to reference the real MDT-object.
+ * For the case that the parent MDT-object stored in some MDT-object's
+ * linkEA entry is lost, the LFSCK will re-create the parent object as
+ * an orphan and insert it into .lustre/lost+found/MDTxxxx/ directory
+ * with the name ${FID}-P-${conflict_version}.
  *
  * \param[in] env      pointer to the thread context
  * \param[in] com      pointer to the lfsck component
- * \param[in] parent   pointer to the parent directory
- * \param[in] child    pointer to the MDT-object that may be the real
- *                     MDT-object corresponding to the name entry in parent
- * \param[in] cfid     the current FID in the name entry
- * \param[in] cname    contains the name of the child in the parent directory
+ * \param[in] orphan   pointer to the orphan MDT-object to be created
+ * \param[in] type     the orphan's type to be created
+ *
+ *  type "P":          The orphan object to be created was a parent directory
+ *                     of some MDT-object which linkEA shows that the @orphan
+ *                     object is missing.
+ *
+ * \see lfsck_layout_recreate_parent() for more types.
+ *
+ * \param[in] lmv      pointer to master LMV EA that will be set to the orphan
  *
  * \retval             positive number for repaired cases
- * \retval             0 if nothing to be repaired
  * \retval             negative error number on failure
  */
-static int lfsck_namespace_replace_cond(const struct lu_env *env,
-                                       struct lfsck_component *com,
-                                       struct dt_object *parent,
-                                       struct dt_object *child,
-                                       const struct lu_fid *cfid,
-                                       const struct lu_name *cname)
+static int lfsck_namespace_create_orphan_local(const struct lu_env *env,
+                                              struct lfsck_component *com,
+                                              struct dt_object *orphan,
+                                              __u32 type,
+                                              struct lmv_mds_md_v1 *lmv)
 {
        struct lfsck_thread_info        *info   = lfsck_env_info(env);
-       struct lu_fid                   *tfid   = &info->lti_fid5;
        struct lu_attr                  *la     = &info->lti_la;
+       struct dt_allocation_hint       *hint   = &info->lti_hint;
+       struct dt_object_format         *dof    = &info->lti_dof;
+       struct lu_name                  *cname  = &info->lti_name2;
        struct dt_insert_rec            *rec    = &info->lti_dt_rec;
+       struct lu_fid                   *tfid   = &info->lti_fid;
+       struct lmv_mds_md_v1            *lmv2   = &info->lti_lmv2;
+       const struct lu_fid             *cfid   = lfsck_dto2fid(orphan);
+       const struct lu_fid             *pfid;
        struct lfsck_instance           *lfsck  = com->lc_lfsck;
-       struct dt_device                *dev    = lfsck->li_next;
-       const char                      *name   = cname->ln_name;
-       struct dt_object                *obj    = NULL;
-       struct lustre_handle             plh    = { 0 };
-       struct lustre_handle             clh    = { 0 };
-       struct linkea_data               ldata  = { 0 };
+       struct dt_device                *dev    = lfsck->li_bottom;
+       struct dt_object                *parent = NULL;
+       struct dt_object                *child  = NULL;
        struct thandle                  *th     = NULL;
-       bool                             exist  = true;
+       struct lustre_handle             lh     = { 0 };
+       struct linkea_data               ldata  = { 0 };
+       struct lu_buf                    linkea_buf;
+       struct lu_buf                    lmv_buf;
+       char                             name[32];
+       int                              namelen;
+       int                              idx    = 0;
        int                              rc     = 0;
        ENTRY;
 
-       rc = lfsck_ibits_lock(env, lfsck, parent, &plh,
-                             MDS_INODELOCK_UPDATE, LCK_EX);
-       if (rc != 0)
-               GOTO(log, rc);
-
-       if (!fid_is_sane(cfid)) {
-               exist = false;
-               goto replace;
-       }
-
-       obj = lfsck_object_find(env, lfsck, cfid);
-       if (IS_ERR(obj)) {
-               rc = PTR_ERR(obj);
-               if (rc == -ENOENT) {
-                       exist = false;
-                       goto replace;
-               }
+       LASSERT(!dt_object_exists(orphan));
+       LASSERT(!dt_object_remote(orphan));
 
-               GOTO(log, rc);
-       }
+       /* @orphan maybe not attached to lfsck->li_bottom */
+       child = lfsck_object_find_by_dev(env, dev, cfid);
+       if (IS_ERR(child))
+               GOTO(log, rc = PTR_ERR(child));
 
-       if (!dt_object_exists(obj)) {
-               exist = false;
-               goto replace;
-       }
+       cname->ln_name = NULL;
+       if (lfsck->li_bookmark_ram.lb_param & LPF_DRYRUN)
+               GOTO(log, rc = 1);
 
-       rc = dt_lookup(env, parent, (struct dt_rec *)tfid,
-                      (const struct dt_key *)name, BYPASS_CAPA);
-       if (rc == -ENOENT) {
-               exist = false;
-               goto replace;
+       /* Create .lustre/lost+found/MDTxxxx when needed. */
+       if (unlikely(lfsck->li_lpf_obj == NULL)) {
+               rc = lfsck_create_lpf(env, lfsck);
+               if (rc != 0)
+                       GOTO(log, rc);
        }
 
-       if (rc != 0)
-               GOTO(log, rc);
-
-       /* Someone changed the name entry, cannot replace it. */
-       if (!lu_fid_eq(cfid, tfid))
-               GOTO(log, rc = 0);
+       parent = lfsck->li_lpf_obj;
+       pfid = lfsck_dto2fid(parent);
 
-       /* lock the object to be destroyed. */
-       rc = lfsck_ibits_lock(env, lfsck, obj, &clh,
-                             MDS_INODELOCK_UPDATE |
-                             MDS_INODELOCK_XATTR, LCK_EX);
+       /* Hold update lock on the parent to prevent others to access. */
+       rc = lfsck_ibits_lock(env, lfsck, parent, &lh,
+                             MDS_INODELOCK_UPDATE, LCK_EX);
        if (rc != 0)
                GOTO(log, rc);
 
-       if (unlikely(lfsck_is_dead_obj(obj))) {
-               exist = false;
-               goto replace;
-       }
-
-       rc = dt_attr_get(env, obj, la, BYPASS_CAPA);
-       if (rc != 0)
-               GOTO(log, rc);
+       do {
+               namelen = snprintf(name, 31, DFID"-P-%d",
+                                  PFID(cfid), idx++);
+               rc = dt_lookup(env, parent, (struct dt_rec *)tfid,
+                              (const struct dt_key *)name, BYPASS_CAPA);
+               if (rc != 0 && rc != -ENOENT)
+                       GOTO(unlock1, rc);
+       } while (rc == 0);
 
-       /* The object has been modified by other(s), or it is not created by
-        * LFSCK, the two cases are indistinguishable. So cannot replace it. */
-       if (la->la_ctime != 0)
-               GOTO(log, rc);
+       cname->ln_name = name;
+       cname->ln_namelen = namelen;
 
-       if (S_ISREG(la->la_mode)) {
-               rc = dt_xattr_get(env, obj, &LU_BUF_NULL, XATTR_NAME_LOV,
-                                 BYPASS_CAPA);
-               /* If someone has created related OST-object(s),
-                * then keep it. */
-               if ((rc > 0) || (rc < 0 && rc != -ENODATA))
-                       GOTO(log, rc = (rc > 0 ? 0 : rc));
-       }
+       memset(la, 0, sizeof(*la));
+       la->la_mode = type | (S_ISDIR(type) ? 0700 : 0600);
+       la->la_valid = LA_TYPE | LA_MODE | LA_UID | LA_GID |
+                      LA_ATIME | LA_MTIME | LA_CTIME;
 
-replace:
-       dt_read_lock(env, child, 0);
-       rc = lfsck_links_read2(env, child, &ldata);
-       dt_read_unlock(env, child);
+       child->do_ops->do_ah_init(env, hint, parent, child,
+                                 la->la_mode & S_IFMT);
 
-       /* Someone changed the child, no need to replace. */
-       if (rc == -ENODATA)
-               GOTO(log, rc = 0);
+       memset(dof, 0, sizeof(*dof));
+       dof->dof_type = dt_mode_to_dft(type);
 
+       rc = linkea_data_new(&ldata, &info->lti_linkea_buf2);
        if (rc != 0)
-               GOTO(log, rc);
+               GOTO(unlock1, rc);
 
-       rc = linkea_links_find(&ldata, cname, lfsck_dto2fid(parent));
-       /* Someone moved the child, no need to replace. */
+       rc = linkea_add_buf(&ldata, cname, pfid);
        if (rc != 0)
-               GOTO(log, rc = 0);
-
-       if (lfsck->li_bookmark_ram.lb_param & LPF_DRYRUN)
-               GOTO(log, rc = 1);
+               GOTO(unlock1, rc);
 
        th = dt_trans_create(env, dev);
        if (IS_ERR(th))
-               GOTO(log, rc = PTR_ERR(th));
+               GOTO(unlock1, rc = PTR_ERR(th));
 
-       if (exist) {
-               rc = dt_declare_destroy(env, obj, th);
+       rc = dt_declare_create(env, child, la, hint, dof, th);
+       if (rc == 0 && S_ISDIR(type))
+               rc = dt_declare_ref_add(env, child, th);
+
+       if (rc != 0)
+               GOTO(stop, rc);
+
+       if (lmv != NULL) {
+               lmv->lmv_magic = LMV_MAGIC;
+               lmv->lmv_master_mdt_index = lfsck_dev_idx(dev);
+               lfsck_lmv_header_cpu_to_le(lmv2, lmv);
+               lfsck_buf_init(&lmv_buf, lmv2, sizeof(*lmv2));
+               rc = dt_declare_xattr_set(env, child, &lmv_buf,
+                                         XATTR_NAME_LMV, 0, th);
                if (rc != 0)
                        GOTO(stop, rc);
        }
 
-       rc = dt_declare_delete(env, parent, (const struct dt_key *)name, th);
+       lfsck_buf_init(&linkea_buf, ldata.ld_buf->lb_buf,
+                      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);
 
-       rec->rec_type = S_IFDIR;
-       rec->rec_fid = lfsck_dto2fid(child);
+       rec->rec_type = type;
+       rec->rec_fid = cfid;
        rc = dt_declare_insert(env, parent, (const struct dt_rec *)rec,
                               (const struct dt_key *)name, th);
+       if (rc == 0 && S_ISDIR(type))
+               rc = dt_declare_ref_add(env, parent, th);
+
        if (rc != 0)
                GOTO(stop, rc);
 
-       rc = dt_trans_start(env, dev, th);
+       rc = dt_trans_start_local(env, dev, th);
        if (rc != 0)
                GOTO(stop, rc);
 
-       if (exist) {
-               rc = dt_destroy(env, obj, th);
+       dt_write_lock(env, child, 0);
+       rc = dt_create(env, child, la, hint, dof, th);
+       if (rc != 0)
+               GOTO(unlock2, rc);
+
+       if (S_ISDIR(type)) {
+               if (unlikely(!dt_try_as_dir(env, child)))
+                       GOTO(unlock2, rc = -ENOTDIR);
+
+               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(stop, rc);
+                       GOTO(unlock2, rc);
+
+               rec->rec_fid = pfid;
+               rc = dt_insert(env, child, (const struct dt_rec *)rec,
+                              (const struct dt_key *)dotdot, th,
+                              BYPASS_CAPA, 1);
+               if (rc != 0)
+                       GOTO(unlock2, rc);
+
+               rc = dt_ref_add(env, child, th);
+               if (rc != 0)
+                       GOTO(unlock2, rc);
        }
 
-       /* The old name entry maybe not exist. */
-       dt_delete(env, parent, (const struct dt_key *)name, th,
-                 BYPASS_CAPA);
+       if (lmv != NULL) {
+               rc = dt_xattr_set(env, child, &lmv_buf, XATTR_NAME_LMV, 0,
+                                 th, BYPASS_CAPA);
+               if (rc != 0)
+                       GOTO(unlock2, rc);
+       }
+
+       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);
 
+       rec->rec_type = type;
+       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 && S_ISDIR(type)) {
+               dt_write_lock(env, parent, 0);
+               rc = dt_ref_add(env, parent, th);
+               dt_write_unlock(env, parent);
+       }
 
        GOTO(stop, rc = (rc == 0 ? 1 : rc));
 
+unlock2:
+       dt_write_unlock(env, child);
+
 stop:
        dt_trans_stop(env, dev, th);
 
-log:
-       lfsck_ibits_unlock(&clh, LCK_EX);
-       lfsck_ibits_unlock(&plh, LCK_EX);
-       if (obj != NULL && !IS_ERR(obj))
-               lfsck_object_put(env, obj);
+unlock1:
+       lfsck_ibits_unlock(&lh, LCK_EX);
 
-       CDEBUG(D_LFSCK, "%s: namespace LFSCK conditionally destroy the "
-              "object "DFID" because of conflict with the object "DFID
-              " under the parent "DFID" with name %s: rc = %d\n",
+log:
+       CDEBUG(D_LFSCK, "%s: namespace LFSCK create orphan locally for "
+              "the object "DFID", name = %s, type %o: rc = %d\n",
               lfsck_lfsck2name(lfsck), PFID(cfid),
-              PFID(lfsck_dto2fid(child)), PFID(lfsck_dto2fid(parent)),
-              name, rc);
+              cname->ln_name != NULL ? cname->ln_name : "<NULL>", type, rc);
+
+       if (child != NULL && !IS_ERR(child))
+               lfsck_object_put(env, child);
 
        return rc;
 }
 
 /**
- * Overwrite the linkEA for the object with the given ldata.
+ * Create the specified orphan MDT-object.
  *
- * The caller should take the ldlm lock before the calling.
+ * For the case that the parent MDT-object stored in some MDT-object's
+ * linkEA entry is lost, the LFSCK will re-create the parent object as
+ * an orphan and insert it into .lustre/lost+found/MDTxxxx/ directory
+ * with the name: ${FID}-P-${conflict_version}.
  *
  * \param[in] env      pointer to the thread context
  * \param[in] com      pointer to the lfsck component
- * \param[in] obj      pointer to the dt_object to be handled
- * \param[in] ldata    pointer to the new linkEA data
+ * \param[in] orphan   pointer to the orphan MDT-object
+ *
+ *  type "P":          The orphan object to be created was a parent directory
+ *                     of some MDT-object which linkEA shows that the @orphan
+ *                     object is missing.
+ *
+ * \see lfsck_layout_recreate_parent() for more types.
+ *
+ * \param[in] lmv      pointer to master LMV EA that will be set to the orphan
  *
  * \retval             positive number for repaired cases
- * \retval             0 if nothing to be repaired
+ * \retval             0 if needs to repair nothing
  * \retval             negative error number on failure
  */
-int lfsck_namespace_rebuild_linkea(const struct lu_env *env,
-                                  struct lfsck_component *com,
-                                  struct dt_object *obj,
-                                  struct linkea_data *ldata)
+static int lfsck_namespace_create_orphan(const struct lu_env *env,
+                                        struct lfsck_component *com,
+                                        struct dt_object *orphan,
+                                        struct lmv_mds_md_v1 *lmv)
 {
-       struct lfsck_instance           *lfsck  = com->lc_lfsck;
-       struct dt_device                *dev    = lfsck->li_bottom;
-       struct thandle                  *th     = NULL;
-       struct lu_buf                    linkea_buf;
-       int                              rc     = 0;
-       ENTRY;
-
-       LASSERT(!dt_object_remote(obj));
-
-       th = dt_trans_create(env, dev);
-       if (IS_ERR(th))
-               GOTO(log, rc = PTR_ERR(th));
+       struct lfsck_namespace *ns = com->lc_file_ram;
+       int                     rc;
 
-       lfsck_buf_init(&linkea_buf, ldata->ld_buf->lb_buf,
-                      ldata->ld_leh->leh_len);
-       rc = dt_declare_xattr_set(env, obj, &linkea_buf,
-                                 XATTR_NAME_LINK, 0, th);
-       if (rc != 0)
-               GOTO(stop, rc);
+       if (dt_object_remote(orphan))
+               rc = lfsck_namespace_create_orphan_remote(env, com, orphan,
+                                                         S_IFDIR, lmv);
+       else
+               rc = lfsck_namespace_create_orphan_local(env, com, orphan,
+                                                        S_IFDIR, lmv);
 
-       rc = dt_trans_start_local(env, dev, th);
        if (rc != 0)
-               GOTO(stop, rc);
-
-       dt_write_lock(env, obj, 0);
-       if (unlikely(lfsck_is_dead_obj(obj)))
-               GOTO(unlock, rc = 0);
-
-       if (lfsck->li_bookmark_ram.lb_param & LPF_DRYRUN)
-               GOTO(unlock, rc = 1);
-
-       rc = dt_xattr_set(env, obj, &linkea_buf,
-                         XATTR_NAME_LINK, 0, th, BYPASS_CAPA);
-
-       GOTO(unlock, rc = (rc == 0 ? 1 : rc));
-
-unlock:
-       dt_write_unlock(env, obj);
-
-stop:
-       dt_trans_stop(env, dev, th);
-
-log:
-       CDEBUG(D_LFSCK, "%s: namespace LFSCK rebuild linkEA for the "
-              "object "DFID": rc = %d\n",
-              lfsck_lfsck2name(lfsck), PFID(lfsck_dto2fid(obj)), rc);
-
-       if (rc != 0) {
-               struct lfsck_namespace *ns = com->lc_file_ram;
-
                ns->ln_flags |= LF_INCONSISTENT;
-       }
 
        return rc;
 }
 
 /**
- * Repair invalid name entry.
+ * Remove the specified entry from the linkEA.
  *
- * If the name entry contains invalid information, such as bad file type
- * or (and) corrupted object FID, then either remove the name entry or
- * udpate the name entry with the given (right) information.
+ * Locate the linkEA entry with the given @cname and @pfid, then
+ * remove this entry or the other entries those are repeated with
+ * this entry.
  *
  * \param[in] env      pointer to the thread context
  * \param[in] com      pointer to the lfsck component
- * \param[in] parent   pointer to the parent directory
- * \param[in] child    pointer to the object referenced by the name entry
- * \param[in] name     the old name of the child under the parent directory
- * \param[in] name2    the new name of the child under the parent directory
- * \param[in] type     the type claimed by the name entry
- * \param[in] update   update the name entry if true; otherwise, remove it
- * \param[in] dec      decrease the parent nlink count if true
+ * \param[in] obj      pointer to the dt_object to be handled
+ * \param[in,out]ldata  pointer to the buffer that holds the linkEA
+ * \param[in] cname    the name for the child in the parent directory
+ * \param[in] pfid     the parent directory's FID for the linkEA
+ * \param[in] next     if true, then remove the first found linkEA
+ *                     entry, and move the ldata->ld_lee to next entry
  *
- * \retval             positive number for repaired successfully
+ * \retval             positive number for repaired cases
  * \retval             0 if nothing to be repaired
  * \retval             negative error number on failure
  */
-int lfsck_namespace_repair_dirent(const struct lu_env *env,
-                                 struct lfsck_component *com,
-                                 struct dt_object *parent,
-                                 struct dt_object *child,
-                                 const char *name, const char *name2,
-                                 __u16 type, bool update, bool dec)
+static int lfsck_namespace_shrink_linkea(const struct lu_env *env,
+                                        struct lfsck_component *com,
+                                        struct dt_object *obj,
+                                        struct linkea_data *ldata,
+                                        struct lu_name *cname,
+                                        struct lu_fid *pfid,
+                                        bool next)
 {
-       struct lfsck_thread_info        *info   = lfsck_env_info(env);
-       struct dt_insert_rec            *rec    = &info->lti_dt_rec;
-       const struct lu_fid             *cfid   = lfsck_dto2fid(child);
-       struct lu_fid                   *tfid   = &info->lti_fid5;
-       struct lfsck_instance           *lfsck  = com->lc_lfsck;
-       struct dt_device                *dev    = lfsck->li_next;
-       struct thandle                  *th     = NULL;
-       struct lustre_handle             lh     = { 0 };
-       int                              rc     = 0;
+       struct lfsck_instance           *lfsck     = com->lc_lfsck;
+       struct dt_device                *dev       = lfsck->li_bottom;
+       struct lfsck_bookmark           *bk        = &lfsck->li_bookmark_ram;
+       struct thandle                  *th        = NULL;
+       struct lustre_handle             lh        = { 0 };
+       struct linkea_data               ldata_new = { 0 };
+       struct lu_buf                    linkea_buf;
+       int                              rc        = 0;
        ENTRY;
 
-       if (unlikely(!dt_try_as_dir(env, parent)))
-               GOTO(log, rc = -ENOTDIR);
-
-       rc = lfsck_ibits_lock(env, lfsck, parent, &lh,
-                             MDS_INODELOCK_UPDATE, LCK_EX);
+       rc = lfsck_ibits_lock(env, lfsck, obj, &lh,
+                             MDS_INODELOCK_UPDATE |
+                             MDS_INODELOCK_XATTR, LCK_EX);
        if (rc != 0)
                GOTO(log, rc);
 
+       if (next)
+               linkea_del_buf(ldata, cname);
+       else
+               lfsck_namespace_filter_linkea_entry(ldata, cname, pfid,
+                                                   true);
+       lfsck_buf_init(&linkea_buf, ldata->ld_buf->lb_buf,
+                      ldata->ld_leh->leh_len);
+
+again:
        th = dt_trans_create(env, dev);
        if (IS_ERR(th))
                GOTO(unlock1, rc = PTR_ERR(th));
 
-       rc = dt_declare_delete(env, parent, (const struct dt_key *)name, th);
+       rc = dt_declare_xattr_set(env, obj, &linkea_buf,
+                                 XATTR_NAME_LINK, 0, th);
        if (rc != 0)
                GOTO(stop, rc);
 
-       if (update) {
-               rec->rec_type = lfsck_object_type(child) & S_IFMT;
-               rec->rec_fid = cfid;
-               rc = dt_declare_insert(env, parent,
-                                      (const struct dt_rec *)rec,
-                                      (const struct dt_key *)name2, th);
-               if (rc != 0)
-                       GOTO(stop, rc);
-       }
-
-       if (dec) {
-               rc = dt_declare_ref_del(env, parent, th);
-               if (rc != 0)
-                       GOTO(stop, rc);
-       }
-
-       rc = dt_trans_start(env, dev, th);
+       rc = dt_trans_start_local(env, dev, th);
        if (rc != 0)
                GOTO(stop, rc);
 
-       dt_write_lock(env, parent, 0);
-       rc = dt_lookup(env, parent, (struct dt_rec *)tfid,
-                      (const struct dt_key *)name, BYPASS_CAPA);
-       /* Someone has removed the bad name entry by race. */
-       if (rc == -ENOENT)
-               GOTO(unlock2, rc = 0);
+       dt_write_lock(env, obj, 0);
+       if (unlikely(lfsck_is_dead_obj(obj)))
+               GOTO(unlock2, rc = -ENOENT);
 
+       rc = lfsck_links_read2(env, obj, &ldata_new);
        if (rc != 0)
                GOTO(unlock2, rc);
 
-       /* Someone has removed the bad name entry and reuse it for other
-        * object by race. */
-       if (!lu_fid_eq(tfid, cfid))
+       /* The specified linkEA entry has been removed by race. */
+       rc = linkea_links_find(&ldata_new, cname, pfid);
+       if (rc != 0)
                GOTO(unlock2, rc = 0);
 
-       if (lfsck->li_bookmark_ram.lb_param & LPF_DRYRUN)
+       if (bk->lb_param & LPF_DRYRUN)
                GOTO(unlock2, rc = 1);
 
-       rc = dt_delete(env, parent, (const struct dt_key *)name, th,
-                      BYPASS_CAPA);
-       if (rc != 0)
-               GOTO(unlock2, rc);
+       if (next)
+               linkea_del_buf(&ldata_new, cname);
+       else
+               lfsck_namespace_filter_linkea_entry(&ldata_new, cname, pfid,
+                                                   true);
 
-       if (update) {
-               rc = dt_insert(env, parent,
-                              (const struct dt_rec *)rec,
-                              (const struct dt_key *)name2, th,
-                              BYPASS_CAPA, 1);
-               if (rc != 0)
-                       GOTO(unlock2, rc);
+       if (linkea_buf.lb_len < ldata_new.ld_leh->leh_len) {
+               dt_write_unlock(env, obj);
+               dt_trans_stop(env, dev, th);
+               lfsck_buf_init(&linkea_buf, ldata_new.ld_buf->lb_buf,
+                              ldata_new.ld_leh->leh_len);
+               goto again;
        }
 
-       if (dec) {
-               rc = dt_ref_del(env, parent, th);
-               if (rc != 0)
-                       GOTO(unlock2, rc);
-       }
+       lfsck_buf_init(&linkea_buf, ldata_new.ld_buf->lb_buf,
+                      ldata_new.ld_leh->leh_len);
+       rc = dt_xattr_set(env, obj, &linkea_buf,
+                         XATTR_NAME_LINK, 0, th, BYPASS_CAPA);
 
        GOTO(unlock2, rc = (rc == 0 ? 1 : rc));
 
 unlock2:
-       dt_write_unlock(env, parent);
+       dt_write_unlock(env, obj);
 
 stop:
        dt_trans_stop(env, dev, th);
 
-       /* We are not sure whether the child will become orphan or not.
-        * Record it in the LFSCK tracing file for further checking in
-        * the second-stage scanning. */
-       if (!update && !dec && rc == 0)
-               lfsck_namespace_trace_update(env, com, cfid,
-                                            LNTF_CHECK_LINKEA, true);
-
 unlock1:
        lfsck_ibits_unlock(&lh, LCK_EX);
 
 log:
-       CDEBUG(D_LFSCK, "%s: namespace LFSCK assistant found bad name "
-              "entry for: parent "DFID", child "DFID", name %s, type "
-              "in name entry %o, type claimed by child %o. repair it "
-              "by %s with new name2 %s: rc = %d\n", lfsck_lfsck2name(lfsck),
-              PFID(lfsck_dto2fid(parent)), PFID(lfsck_dto2fid(child)),
-              name, type, update ? lfsck_object_type(child) : 0,
-              update ? "updating" : "removing", name2, rc);
+       CDEBUG(D_LFSCK, "%s: namespace LFSCK remove %s linkEA entry "
+              "for the object: "DFID", parent "DFID", name %.*s\n",
+              lfsck_lfsck2name(lfsck), next ? "invalid" : "redundant",
+              PFID(lfsck_dto2fid(obj)), PFID(pfid), cname->ln_namelen,
+              cname->ln_name);
 
        if (rc != 0) {
                struct lfsck_namespace *ns = com->lc_file_ram;
 }
 
 /**
- * Update the ".." name entry for the given object.
- *
- * The object's ".." is corrupted, this function will update the ".." name
- * entry with the given pfid, and the linkEA with the given ldata.
+ * Conditionally remove the specified entry from the linkEA.
  *
- * The caller should take the ldlm lock before the calling.
+ * Take the parent lock firstly, then check whether the specified
+ * name entry exists or not: if yes, do nothing; otherwise, call
+ * lfsck_namespace_shrink_linkea() to remove the linkea entry.
  *
  * \param[in] env      pointer to the thread context
  * \param[in] com      pointer to the lfsck component
- * \param[in] obj      pointer to the dt_object to be handled
- * \param[in] pfid     the new fid for the object's ".." name entry
- * \param[in] cname    the name for the @obj in the parent directory
+ * \param[in] parent   pointer to the parent directory
+ * \param[in] child    pointer to the child object that holds the linkEA
+ * \param[in,out]ldata  pointer to the buffer that holds the linkEA
+ * \param[in] cname    the name for the child in the parent directory
+ * \param[in] pfid     the parent directory's FID for the linkEA
  *
  * \retval             positive number for repaired cases
  * \retval             0 if nothing to be repaired
  * \retval             negative error number on failure
  */
-static int lfsck_namespace_repair_unmatched_pairs(const struct lu_env *env,
-                                                 struct lfsck_component *com,
-                                                 struct dt_object *obj,
-                                                 const struct lu_fid *pfid,
-                                                 struct lu_name *cname)
+static int lfsck_namespace_shrink_linkea_cond(const struct lu_env *env,
+                                             struct lfsck_component *com,
+                                             struct dt_object *parent,
+                                             struct dt_object *child,
+                                             struct linkea_data *ldata,
+                                             struct lu_name *cname,
+                                             struct lu_fid *pfid)
 {
-       struct lfsck_thread_info        *info   = lfsck_env_info(env);
+       struct lu_fid           *cfid   = &lfsck_env_info(env)->lti_fid3;
+       struct lustre_handle     lh     = { 0 };
+       int                      rc;
+       ENTRY;
+
+       rc = lfsck_ibits_lock(env, com->lc_lfsck, parent, &lh,
+                             MDS_INODELOCK_UPDATE, LCK_EX);
+       if (rc != 0)
+               RETURN(rc);
+
+       dt_read_lock(env, parent, 0);
+       if (unlikely(lfsck_is_dead_obj(parent))) {
+               dt_read_unlock(env, parent);
+               lfsck_ibits_unlock(&lh, LCK_EX);
+               rc = lfsck_namespace_shrink_linkea(env, com, child, ldata,
+                                                  cname, pfid, true);
+
+               RETURN(rc);
+       }
+
+       rc = dt_lookup(env, parent, (struct dt_rec *)cfid,
+                      (const struct dt_key *)cname->ln_name,
+                      BYPASS_CAPA);
+       dt_read_unlock(env, parent);
+
+       /* It is safe to release the ldlm lock, because when the logic come
+        * here, we have got all the needed information above whether the
+        * linkEA entry is valid or not. It is not important that others
+        * may add new linkEA entry after the ldlm lock released. If other
+        * has removed the specified linkEA entry by race, then it is OK,
+        * because the subsequent lfsck_namespace_shrink_linkea() can handle
+        * such case. */
+       lfsck_ibits_unlock(&lh, LCK_EX);
+       if (rc == -ENOENT) {
+               rc = lfsck_namespace_shrink_linkea(env, com, child, ldata,
+                                                  cname, pfid, true);
+
+               RETURN(rc);
+       }
+
+       if (rc != 0)
+               RETURN(rc);
+
+       /* The LFSCK just found some internal status of cross-MDTs
+        * create operation. That is normal. */
+       if (lu_fid_eq(cfid, lfsck_dto2fid(child))) {
+               linkea_next_entry(ldata);
+
+               RETURN(0);
+       }
+
+       rc = lfsck_namespace_shrink_linkea(env, com, child, ldata, cname,
+                                          pfid, true);
+
+       RETURN(rc);
+}
+
+/**
+ * Conditionally replace name entry in the parent.
+ *
+ * As required, the LFSCK may re-create the lost MDT-object for dangling
+ * name entry, but such repairing may be wrong because of bad FID in the
+ * name entry. As the LFSCK processing, the real MDT-object may be found,
+ * then the LFSCK should check whether the former re-created MDT-object
+ * has been modified or not, if not, then destroy it and update the name
+ * entry in the parent to reference the real MDT-object.
+ *
+ * \param[in] env      pointer to the thread context
+ * \param[in] com      pointer to the lfsck component
+ * \param[in] parent   pointer to the parent directory
+ * \param[in] child    pointer to the MDT-object that may be the real
+ *                     MDT-object corresponding to the name entry in parent
+ * \param[in] cfid     the current FID in the name entry
+ * \param[in] cname    contains the name of the child in the parent directory
+ *
+ * \retval             positive number for repaired cases
+ * \retval             0 if nothing to be repaired
+ * \retval             negative error number on failure
+ */
+static int lfsck_namespace_replace_cond(const struct lu_env *env,
+                                       struct lfsck_component *com,
+                                       struct dt_object *parent,
+                                       struct dt_object *child,
+                                       const struct lu_fid *cfid,
+                                       const struct lu_name *cname)
+{
+       struct lfsck_thread_info        *info   = lfsck_env_info(env);
+       struct lu_fid                   *tfid   = &info->lti_fid5;
+       struct lu_attr                  *la     = &info->lti_la;
        struct dt_insert_rec            *rec    = &info->lti_dt_rec;
        struct lfsck_instance           *lfsck  = com->lc_lfsck;
-       struct dt_device                *dev    = lfsck->li_bottom;
-       struct thandle                  *th     = NULL;
+       struct dt_device                *dev    = lfsck->li_next;
+       const char                      *name   = cname->ln_name;
+       struct dt_object                *obj    = NULL;
+       struct lustre_handle             plh    = { 0 };
+       struct lustre_handle             clh    = { 0 };
        struct linkea_data               ldata  = { 0 };
-       struct lu_buf                    linkea_buf;
+       struct thandle                  *th     = NULL;
+       bool                             exist  = true;
        int                              rc     = 0;
        ENTRY;
 
-       LASSERT(!dt_object_remote(obj));
-       LASSERT(S_ISDIR(lfsck_object_type(obj)));
+       rc = lfsck_ibits_lock(env, lfsck, parent, &plh,
+                             MDS_INODELOCK_UPDATE, LCK_EX);
+       if (rc != 0)
+               GOTO(log, rc);
+
+       if (!fid_is_sane(cfid)) {
+               exist = false;
+               goto replace;
+       }
+
+       obj = lfsck_object_find(env, lfsck, cfid);
+       if (IS_ERR(obj)) {
+               rc = PTR_ERR(obj);
+               if (rc == -ENOENT) {
+                       exist = false;
+                       goto replace;
+               }
+
+               GOTO(log, rc);
+       }
+
+       if (!dt_object_exists(obj)) {
+               exist = false;
+               goto replace;
+       }
+
+       rc = dt_lookup(env, parent, (struct dt_rec *)tfid,
+                      (const struct dt_key *)name, BYPASS_CAPA);
+       if (rc == -ENOENT) {
+               exist = false;
+               goto replace;
+       }
 
-       rc = linkea_data_new(&ldata, &info->lti_big_buf);
        if (rc != 0)
                GOTO(log, rc);
 
-       rc = linkea_add_buf(&ldata, cname, pfid);
+       /* Someone changed the name entry, cannot replace it. */
+       if (!lu_fid_eq(cfid, tfid))
+               GOTO(log, rc = 0);
+
+       /* lock the object to be destroyed. */
+       rc = lfsck_ibits_lock(env, lfsck, obj, &clh,
+                             MDS_INODELOCK_UPDATE |
+                             MDS_INODELOCK_XATTR, LCK_EX);
        if (rc != 0)
                GOTO(log, rc);
 
-       lfsck_buf_init(&linkea_buf, ldata.ld_buf->lb_buf,
-                      ldata.ld_leh->leh_len);
+       if (unlikely(lfsck_is_dead_obj(obj))) {
+               exist = false;
+               goto replace;
+       }
+
+       rc = dt_attr_get(env, obj, la, BYPASS_CAPA);
+       if (rc != 0)
+               GOTO(log, rc);
+
+       /* The object has been modified by other(s), or it is not created by
+        * LFSCK, the two cases are indistinguishable. So cannot replace it. */
+       if (la->la_ctime != 0)
+               GOTO(log, rc);
+
+       if (S_ISREG(la->la_mode)) {
+               rc = dt_xattr_get(env, obj, &LU_BUF_NULL, XATTR_NAME_LOV,
+                                 BYPASS_CAPA);
+               /* If someone has created related OST-object(s),
+                * then keep it. */
+               if ((rc > 0) || (rc < 0 && rc != -ENODATA))
+                       GOTO(log, rc = (rc > 0 ? 0 : rc));
+       }
+
+replace:
+       dt_read_lock(env, child, 0);
+       rc = lfsck_links_read2(env, child, &ldata);
+       dt_read_unlock(env, child);
+
+       /* Someone changed the child, no need to replace. */
+       if (rc == -ENODATA)
+               GOTO(log, rc = 0);
+
+       if (rc != 0)
+               GOTO(log, rc);
+
+       rc = linkea_links_find(&ldata, cname, lfsck_dto2fid(parent));
+       /* Someone moved the child, no need to replace. */
+       if (rc != 0)
+               GOTO(log, rc = 0);
+
+       if (lfsck->li_bookmark_ram.lb_param & LPF_DRYRUN)
+               GOTO(log, rc = 1);
 
        th = dt_trans_create(env, dev);
        if (IS_ERR(th))
                GOTO(log, rc = PTR_ERR(th));
 
-       rc = dt_declare_delete(env, obj, (const struct dt_key *)dotdot, th);
-       if (rc != 0)
-               GOTO(stop, rc);
+       if (exist) {
+               rc = dt_declare_destroy(env, obj, th);
+               if (rc != 0)
+                       GOTO(stop, rc);
+       }
 
-       rec->rec_type = S_IFDIR;
-       rec->rec_fid = pfid;
-       rc = dt_declare_insert(env, obj, (const struct dt_rec *)rec,
-                              (const struct dt_key *)dotdot, th);
+       rc = dt_declare_delete(env, parent, (const struct dt_key *)name, th);
        if (rc != 0)
                GOTO(stop, rc);
 
-       rc = dt_declare_xattr_set(env, obj, &linkea_buf,
-                                 XATTR_NAME_LINK, 0, th);
+       rec->rec_type = S_IFDIR;
+       rec->rec_fid = lfsck_dto2fid(child);
+       rc = dt_declare_insert(env, parent, (const struct dt_rec *)rec,
+                              (const struct dt_key *)name, th);
        if (rc != 0)
                GOTO(stop, rc);
 
-       rc = dt_trans_start_local(env, dev, th);
+       rc = dt_trans_start(env, dev, th);
        if (rc != 0)
                GOTO(stop, rc);
 
-       dt_write_lock(env, obj, 0);
-       if (unlikely(lfsck_is_dead_obj(obj)))
-               GOTO(unlock, rc = 0);
-
-       if (lfsck->li_bookmark_ram.lb_param & LPF_DRYRUN)
-               GOTO(unlock, rc = 1);
+       if (exist) {
+               rc = dt_destroy(env, obj, th);
+               if (rc != 0)
+                       GOTO(stop, rc);
+       }
 
-       /* The old ".." name entry maybe not exist. */
-       dt_delete(env, obj, (const struct dt_key *)dotdot, th,
+       /* The old name entry maybe not exist. */
+       dt_delete(env, parent, (const struct dt_key *)name, th,
                  BYPASS_CAPA);
 
-       rc = dt_insert(env, obj, (const struct dt_rec *)rec,
-                      (const struct dt_key *)dotdot, th, BYPASS_CAPA, 1);
-       if (rc != 0)
-               GOTO(unlock, rc);
-
-       rc = dt_xattr_set(env, obj, &linkea_buf,
-                         XATTR_NAME_LINK, 0, th, BYPASS_CAPA);
-
-       GOTO(unlock, rc = (rc == 0 ? 1 : rc));
+       rc = dt_insert(env, parent, (const struct dt_rec *)rec,
+                      (const struct dt_key *)name, th, BYPASS_CAPA, 1);
 
-unlock:
-       dt_write_unlock(env, obj);
+       GOTO(stop, rc = (rc == 0 ? 1 : rc));
 
 stop:
        dt_trans_stop(env, dev, th);
 
 log:
-       CDEBUG(D_LFSCK, "%s: namespace LFSCK rebuild dotdot name entry for "
-              "the object "DFID", new parent "DFID": rc = %d\n",
-              lfsck_lfsck2name(lfsck), PFID(lfsck_dto2fid(obj)),
-              PFID(pfid), rc);
-
-       if (rc != 0) {
-               struct lfsck_namespace *ns = com->lc_file_ram;
+       lfsck_ibits_unlock(&clh, LCK_EX);
+       lfsck_ibits_unlock(&plh, LCK_EX);
+       if (obj != NULL && !IS_ERR(obj))
+               lfsck_object_put(env, obj);
 
-               ns->ln_flags |= LF_INCONSISTENT;
-       }
+       CDEBUG(D_LFSCK, "%s: namespace LFSCK conditionally destroy the "
+              "object "DFID" because of conflict with the object "DFID
+              " under the parent "DFID" with name %s: rc = %d\n",
+              lfsck_lfsck2name(lfsck), PFID(cfid),
+              PFID(lfsck_dto2fid(child)), PFID(lfsck_dto2fid(parent)),
+              name, rc);
 
        return rc;
 }
 
 /**
- * Handle orphan @obj during Double Scan Directory.
- *
- * Remove the @obj's current (invalid) linkEA entries, and insert
- * it in the directory .lustre/lost+found/MDTxxxx/ with the name:
- * ${FID}-${PFID}-D-${conflict_version}
+ * Overwrite the linkEA for the object with the given ldata.
  *
  * The caller should take the ldlm lock before the calling.
  *
  * \param[in] env      pointer to the thread context
  * \param[in] com      pointer to the lfsck component
- * \param[in] obj      pointer to the orphan object to be handled
- * \param[in] pfid     the new fid for the object's ".." name entry
- * \param[in,out] lh   ldlm lock handler for the given @obj
- * \param[out] type    to tell the caller what the inconsistency is
+ * \param[in] obj      pointer to the dt_object to be handled
+ * \param[in] ldata    pointer to the new linkEA data
  *
  * \retval             positive number for repaired cases
  * \retval             0 if nothing to be repaired
  * \retval             negative error number on failure
  */
-static int
-lfsck_namespace_dsd_orphan(const struct lu_env *env,
-                          struct lfsck_component *com,
-                          struct dt_object *obj,
-                          const struct lu_fid *pfid,
-                          struct lustre_handle *lh,
-                          enum lfsck_namespace_inconsistency_type *type)
+int lfsck_namespace_rebuild_linkea(const struct lu_env *env,
+                                  struct lfsck_component *com,
+                                  struct dt_object *obj,
+                                  struct linkea_data *ldata)
 {
-       struct lfsck_thread_info *info = lfsck_env_info(env);
-       int                       rc;
+       struct lfsck_instance           *lfsck  = com->lc_lfsck;
+       struct dt_device                *dev    = lfsck->li_bottom;
+       struct thandle                  *th     = NULL;
+       struct lu_buf                    linkea_buf;
+       int                              rc     = 0;
        ENTRY;
 
-       /* Remove the unrecognized linkEA. */
-       rc = lfsck_namespace_links_remove(env, com, obj);
-       lfsck_ibits_unlock(lh, LCK_EX);
-       if (rc < 0 && rc != -ENODATA)
-               RETURN(rc);
+       th = dt_trans_create(env, dev);
+       if (IS_ERR(th))
+               GOTO(log, rc = PTR_ERR(th));
 
-       *type = LNIT_MUL_REF;
-       /* The unique linkEA is invalid, even if the ".." name entry may be
-        * valid, we still cannot know via which name entry this directory
-        * will be referenced. Then handle it as pure orphan. */
-       snprintf(info->lti_tmpbuf, sizeof(info->lti_tmpbuf),
-                "-"DFID, PFID(pfid));
-       rc = lfsck_namespace_insert_orphan(env, com, obj,
-                                          info->lti_tmpbuf, "D", NULL);
+       lfsck_buf_init(&linkea_buf, ldata->ld_buf->lb_buf,
+                      ldata->ld_leh->leh_len);
+       rc = dt_declare_xattr_set(env, obj, &linkea_buf,
+                                 XATTR_NAME_LINK, 0, th);
+       if (rc != 0)
+               GOTO(stop, rc);
 
-       RETURN(rc);
+       rc = dt_trans_start_local(env, dev, th);
+       if (rc != 0)
+               GOTO(stop, rc);
+
+       dt_write_lock(env, obj, 0);
+       if (unlikely(lfsck_is_dead_obj(obj)))
+               GOTO(unlock, rc = 0);
+
+       if (lfsck->li_bookmark_ram.lb_param & LPF_DRYRUN)
+               GOTO(unlock, rc = 1);
+
+       rc = dt_xattr_set(env, obj, &linkea_buf,
+                         XATTR_NAME_LINK, 0, th, BYPASS_CAPA);
+
+       GOTO(unlock, rc = (rc == 0 ? 1 : rc));
+
+unlock:
+       dt_write_unlock(env, obj);
+
+stop:
+       dt_trans_stop(env, dev, th);
+
+log:
+       CDEBUG(D_LFSCK, "%s: namespace LFSCK rebuild linkEA for the "
+              "object "DFID": rc = %d\n",
+              lfsck_lfsck2name(lfsck), PFID(lfsck_dto2fid(obj)), rc);
+
+       if (rc != 0) {
+               struct lfsck_namespace *ns = com->lc_file_ram;
+
+               ns->ln_flags |= LF_INCONSISTENT;
+       }
+
+       return rc;
 }
 
 /**
- * Double Scan Directory object for single linkEA entry case.
+ * Repair invalid name entry.
  *
- * The given @child has unique linkEA entry. If the linkEA entry is valid,
- * then check whether the name is in the namespace or not, if not, add the
- * missing name entry back to namespace. If the linkEA entry is invalid,
- * then remove it and insert the @child in the .lustre/lost+found/MDTxxxx/
- * as an orphan.
+ * If the name entry contains invalid information, such as bad file type
+ * or (and) corrupted object FID, then either remove the name entry or
+ * udpate the name entry with the given (right) information.
  *
  * \param[in] env      pointer to the thread context
  * \param[in] com      pointer to the lfsck component
- * \param[in] child    pointer to the directory to be double scanned
- * \param[in] pfid     the FID corresponding to the ".." entry
- * \param[in] ldata    pointer to the linkEA data for the given @child
- * \param[in,out] lh   ldlm lock handler for the given @child
- * \param[out] type    to tell the caller what the inconsistency is
- * \param[in] retry    if found inconsistency, but the caller does not hold
- *                     ldlm lock on the @child, then set @retry as true
+ * \param[in] parent   pointer to the parent directory
+ * \param[in] child    pointer to the object referenced by the name entry
+ * \param[in] name     the old name of the child under the parent directory
+ * \param[in] name2    the new name of the child under the parent directory
+ * \param[in] type     the type claimed by the name entry
+ * \param[in] update   update the name entry if true; otherwise, remove it
+ * \param[in] dec      decrease the parent nlink count if true
  *
- * \retval             positive number for repaired cases
+ * \retval             positive number for repaired successfully
  * \retval             0 if nothing to be repaired
  * \retval             negative error number on failure
  */
-static int
-lfsck_namespace_dsd_single(const struct lu_env *env,
-                          struct lfsck_component *com,
-                          struct dt_object *child,
-                          const struct lu_fid *pfid,
-                          struct linkea_data *ldata,
-                          struct lustre_handle *lh,
-                          enum lfsck_namespace_inconsistency_type *type,
-                          bool *retry)
+int lfsck_namespace_repair_dirent(const struct lu_env *env,
+                                 struct lfsck_component *com,
+                                 struct dt_object *parent,
+                                 struct dt_object *child,
+                                 const char *name, const char *name2,
+                                 __u16 type, bool update, bool dec)
 {
-       struct lfsck_thread_info *info          = lfsck_env_info(env);
-       struct lu_name           *cname         = &info->lti_name;
-       const struct lu_fid      *cfid          = lfsck_dto2fid(child);
-       struct lu_fid            *tfid          = &info->lti_fid3;
-       struct lfsck_instance    *lfsck         = com->lc_lfsck;
-       struct dt_object         *parent        = NULL;
-       int                       rc            = 0;
+       struct lfsck_thread_info        *info   = lfsck_env_info(env);
+       struct dt_insert_rec            *rec    = &info->lti_dt_rec;
+       const struct lu_fid             *cfid   = lfsck_dto2fid(child);
+       struct lu_fid                   *tfid   = &info->lti_fid5;
+       struct lfsck_instance           *lfsck  = com->lc_lfsck;
+       struct dt_device                *dev    = lfsck->li_next;
+       struct thandle                  *th     = NULL;
+       struct lustre_handle             lh     = { 0 };
+       int                              rc     = 0;
        ENTRY;
 
-       lfsck_namespace_unpack_linkea_entry(ldata, cname, tfid, info->lti_key);
-       /* The unique linkEA entry with bad parent will be handled as orphan. */
-       if (!fid_is_sane(tfid)) {
-               if (!lustre_handle_is_used(lh) && retry != NULL)
-                       *retry = true;
-               else
-                       rc = lfsck_namespace_dsd_orphan(env, com, child,
-                                                       pfid, lh, type);
-
-               GOTO(out, rc);
-       }
-
-       parent = lfsck_object_find_bottom(env, lfsck, tfid);
-       if (IS_ERR(parent))
-               GOTO(out, rc = PTR_ERR(parent));
+       if (unlikely(!dt_try_as_dir(env, parent)))
+               GOTO(log, rc = -ENOTDIR);
 
-       /* We trust the unique linkEA entry in spite of whether it matches the
-        * ".." name entry or not. Because even if the linkEA entry is wrong
-        * and the ".." name entry is right, we still cannot know via which
-        * name entry the child will be referenced, since all known entries
-        * have been verified during the first-stage scanning. */
-       if (!dt_object_exists(parent)) {
-               if (!lustre_handle_is_used(lh) && retry != NULL) {
-                       *retry = true;
+       rc = lfsck_ibits_lock(env, lfsck, parent, &lh,
+                             MDS_INODELOCK_UPDATE, LCK_EX);
+       if (rc != 0)
+               GOTO(log, rc);
 
-                       GOTO(out, rc = 0);
-               }
+       th = dt_trans_create(env, dev);
+       if (IS_ERR(th))
+               GOTO(unlock1, rc = PTR_ERR(th));
 
-               lfsck_ibits_unlock(lh, LCK_EX);
-               /* Create the lost parent as an orphan. */
-               rc = lfsck_namespace_create_orphan(env, com, parent);
-               if (rc >= 0)
-                       /* Add the missing name entry to the parent. */
-                       rc = lfsck_namespace_insert_normal(env, com, parent,
-                                                       child, cname->ln_name);
+       rc = dt_declare_delete(env, parent, (const struct dt_key *)name, th);
+       if (rc != 0)
+               GOTO(stop, rc);
 
-               GOTO(out, rc);
+       if (update) {
+               rec->rec_type = lfsck_object_type(child) & S_IFMT;
+               rec->rec_fid = cfid;
+               rc = dt_declare_insert(env, parent,
+                                      (const struct dt_rec *)rec,
+                                      (const struct dt_key *)name2, th);
+               if (rc != 0)
+                       GOTO(stop, rc);
        }
 
-       /* The unique linkEA entry with bad parent will be handled as orphan. */
-       if (unlikely(!dt_try_as_dir(env, parent))) {
-               if (!lustre_handle_is_used(lh) && retry != NULL)
-                       *retry = true;
-               else
-                       rc = lfsck_namespace_dsd_orphan(env, com, child,
-                                                       pfid, lh, type);
-
-               GOTO(out, rc);
+       if (dec) {
+               rc = dt_declare_ref_del(env, parent, th);
+               if (rc != 0)
+                       GOTO(stop, rc);
        }
 
+       rc = dt_trans_start(env, dev, th);
+       if (rc != 0)
+               GOTO(stop, rc);
+
+       dt_write_lock(env, parent, 0);
        rc = dt_lookup(env, parent, (struct dt_rec *)tfid,
-                      (const struct dt_key *)cname->ln_name, BYPASS_CAPA);
-       if (rc == -ENOENT) {
-               if (!lustre_handle_is_used(lh) && retry != NULL) {
-                       *retry = true;
+                      (const struct dt_key *)name, BYPASS_CAPA);
+       /* Someone has removed the bad name entry by race. */
+       if (rc == -ENOENT)
+               GOTO(unlock2, rc = 0);
 
-                       GOTO(out, rc = 0);
-               }
+       if (rc != 0)
+               GOTO(unlock2, rc);
 
-               lfsck_ibits_unlock(lh, LCK_EX);
-               /* Add the missing name entry back to the namespace. */
-               rc = lfsck_namespace_insert_normal(env, com, parent, child,
-                                                  cname->ln_name);
+       /* Someone has removed the bad name entry and reused it for other
+        * object by race. */
+       if (!lu_fid_eq(tfid, cfid))
+               GOTO(unlock2, rc = 0);
 
-               GOTO(out, rc);
-       }
+       if (lfsck->li_bookmark_ram.lb_param & LPF_DRYRUN)
+               GOTO(unlock2, rc = 1);
 
+       rc = dt_delete(env, parent, (const struct dt_key *)name, th,
+                      BYPASS_CAPA);
        if (rc != 0)
-               GOTO(out, rc);
-
-       if (!lu_fid_eq(tfid, cfid)) {
-               if (!lustre_handle_is_used(lh) && retry != NULL) {
-                       *retry = true;
+               GOTO(unlock2, rc);
 
-                       GOTO(out, rc = 0);
-               }
+       if (update) {
+               rc = dt_insert(env, parent,
+                              (const struct dt_rec *)rec,
+                              (const struct dt_key *)name2, th,
+                              BYPASS_CAPA, 1);
+               if (rc != 0)
+                       GOTO(unlock2, rc);
+       }
 
-               lfsck_ibits_unlock(lh, LCK_EX);
-               /* The name entry references another MDT-object that
-                * may be created by the LFSCK for repairing dangling
-                * name entry. Try to replace it. */
-               rc = lfsck_namespace_replace_cond(env, com, parent, child,
-                                                 tfid, cname);
-               if (rc == 0)
-                       rc = lfsck_namespace_dsd_orphan(env, com, child,
-                                                       pfid, lh, type);
-
-               GOTO(out, rc);
+       if (dec) {
+               rc = dt_ref_del(env, parent, th);
+               if (rc != 0)
+                       GOTO(unlock2, rc);
        }
 
-       /* The ".." name entry is wrong, update it. */
-       if (!lu_fid_eq(pfid, lfsck_dto2fid(parent))) {
-               if (!lustre_handle_is_used(lh) && retry != NULL) {
-                       *retry = true;
+       GOTO(unlock2, rc = (rc == 0 ? 1 : rc));
 
-                       GOTO(out, rc = 0);
-               }
+unlock2:
+       dt_write_unlock(env, parent);
 
-               *type = LNIT_UNMATCHED_PAIRS;
-               rc = lfsck_namespace_repair_unmatched_pairs(env, com, child,
-                                               lfsck_dto2fid(parent), cname);
-       }
+stop:
+       dt_trans_stop(env, dev, th);
 
-       GOTO(out, rc);
+       /* We are not sure whether the child will become orphan or not.
+        * Record it in the LFSCK trace file for further checking in
+        * the second-stage scanning. */
+       if (!update && !dec && rc == 0)
+               lfsck_namespace_trace_update(env, com, cfid,
+                                            LNTF_CHECK_LINKEA, true);
 
-out:
-       if (parent != NULL && !IS_ERR(parent))
-               lfsck_object_put(env, parent);
+unlock1:
+       lfsck_ibits_unlock(&lh, LCK_EX);
+
+log:
+       CDEBUG(D_LFSCK, "%s: namespace LFSCK assistant found bad name "
+              "entry for: parent "DFID", child "DFID", name %s, type "
+              "in name entry %o, type claimed by child %o. repair it "
+              "by %s with new name2 %s: rc = %d\n", lfsck_lfsck2name(lfsck),
+              PFID(lfsck_dto2fid(parent)), PFID(lfsck_dto2fid(child)),
+              name, type, update ? lfsck_object_type(child) : 0,
+              update ? "updating" : "removing", name2, rc);
+
+       if (rc != 0) {
+               struct lfsck_namespace *ns = com->lc_file_ram;
+
+               ns->ln_flags |= LF_INCONSISTENT;
+       }
 
        return rc;
 }
 
 /**
- * Double Scan Directory object for multiple linkEA entries case.
+ * Update the ".." name entry for the given object.
  *
- * The given @child has multiple linkEA entries. There is at most one linkEA
- * entry will be valid, all the others will be removed. Firstly, the function
- * will try to find out the linkEA entry for which the name entry exists under
- * the given parent (@pfid). If there is no linkEA entry that matches the given
- * ".." name entry, then tries to find out the first linkEA entry that both the
- * parent and the name entry exist to rebuild a new ".." name entry.
+ * The object's ".." is corrupted, this function will update the ".." name
+ * entry with the given pfid, and the linkEA with the given ldata.
+ *
+ * The caller should take the ldlm lock before the calling.
  *
  * \param[in] env      pointer to the thread context
  * \param[in] com      pointer to the lfsck component
- * \param[in] child    pointer to the directory to be double scanned
- * \param[in] pfid     the FID corresponding to the ".." entry
- * \param[in] ldata    pointer to the linkEA data for the given @child
- * \param[in,out] lh   ldlm lock handler for the given @child
- * \param[out] type    to tell the caller what the inconsistency is
- * \param[in] lpf      true if the ".." entry is under lost+found/MDTxxxx/
+ * \param[in] obj      pointer to the dt_object to be handled
+ * \param[in] pfid     the new fid for the object's ".." name entry
+ * \param[in] cname    the name for the @obj in the parent directory
  *
  * \retval             positive number for repaired cases
  * \retval             0 if nothing to be repaired
  * \retval             negative error number on failure
  */
-static int
-lfsck_namespace_dsd_multiple(const struct lu_env *env,
-                            struct lfsck_component *com,
-                            struct dt_object *child,
-                            const struct lu_fid *pfid,
-                            struct linkea_data *ldata,
-                            struct lustre_handle *lh,
-                            enum lfsck_namespace_inconsistency_type *type,
-                            bool lpf)
+static int lfsck_namespace_repair_unmatched_pairs(const struct lu_env *env,
+                                                 struct lfsck_component *com,
+                                                 struct dt_object *obj,
+                                                 const struct lu_fid *pfid,
+                                                 struct lu_name *cname)
 {
-       struct lfsck_thread_info *info          = lfsck_env_info(env);
-       struct lu_name           *cname         = &info->lti_name;
-       const struct lu_fid      *cfid          = lfsck_dto2fid(child);
-       struct lu_fid            *tfid          = &info->lti_fid3;
-       struct lu_fid            *pfid2         = &info->lti_fid4;
-       struct lfsck_namespace   *ns            = com->lc_file_ram;
-       struct lfsck_instance    *lfsck         = com->lc_lfsck;
-       struct lfsck_bookmark    *bk            = &lfsck->li_bookmark_ram;
-       struct dt_object         *parent        = NULL;
-       struct linkea_data        ldata_new     = { 0 };
-       int                       count         = 0;
-       int                       rc            = 0;
-       bool                      once          = true;
+       struct lfsck_thread_info        *info   = lfsck_env_info(env);
+       struct dt_insert_rec            *rec    = &info->lti_dt_rec;
+       struct lfsck_instance           *lfsck  = com->lc_lfsck;
+       struct dt_device                *dev    = lfsck->li_bottom;
+       struct thandle                  *th     = NULL;
+       struct linkea_data               ldata  = { 0 };
+       struct lu_buf                    linkea_buf;
+       int                              rc     = 0;
        ENTRY;
 
-again:
-       while (ldata->ld_lee != NULL) {
-               lfsck_namespace_unpack_linkea_entry(ldata, cname, tfid,
-                                                   info->lti_key);
-               /* Drop repeated linkEA entries. */
-               lfsck_namespace_filter_linkea_entry(ldata, cname, tfid, true);
-               /* Drop invalid linkEA entry. */
-               if (!fid_is_sane(tfid)) {
-                       linkea_del_buf(ldata, cname);
-                       continue;
-               }
+       LASSERT(!dt_object_remote(obj));
+       LASSERT(S_ISDIR(lfsck_object_type(obj)));
 
-               /* If current dotdot is the .lustre/lost+found/MDTxxxx/,
-                * then it is possible that: the directry object has ever
-                * been lost, but its name entry was there. In the former
-                * LFSCK run, during the first-stage scanning, the LFSCK
-                * found the dangling name entry, but it did not recreate
-                * the lost object, and when moved to the second-stage
-                * scanning, some children objects of the lost directory
-                * object were found, then the LFSCK recreated such lost
-                * directory object as an orphan.
-                *
-                * When the LFSCK runs again, if the dangling name is still
-                * there, the LFSCK should move the orphan directory object
-                * back to the normal namespace. */
-               if (!lpf && !lu_fid_eq(pfid, tfid) && once) {
-                       linkea_next_entry(ldata);
-                       continue;
-               }
+       rc = linkea_data_new(&ldata, &info->lti_big_buf);
+       if (rc != 0)
+               GOTO(log, rc);
 
-               parent = lfsck_object_find_bottom(env, lfsck, tfid);
-               if (IS_ERR(parent))
-                       RETURN(PTR_ERR(parent));
+       rc = linkea_add_buf(&ldata, cname, pfid);
+       if (rc != 0)
+               GOTO(log, rc);
 
-               if (!dt_object_exists(parent)) {
-                       lfsck_object_put(env, parent);
-                       if (ldata->ld_leh->leh_reccount > 1) {
-                               /* If it is NOT the last linkEA entry, then
-                                * there is still other chance to make the
-                                * child to be visible via other parent, then
-                                * remove this linkEA entry. */
-                               linkea_del_buf(ldata, cname);
-                               continue;
-                       }
+       lfsck_buf_init(&linkea_buf, ldata.ld_buf->lb_buf,
+                      ldata.ld_leh->leh_len);
 
-                       break;
-               }
+       th = dt_trans_create(env, dev);
+       if (IS_ERR(th))
+               GOTO(log, rc = PTR_ERR(th));
 
-               /* The linkEA entry with bad parent will be removed. */
-               if (unlikely(!dt_try_as_dir(env, parent))) {
-                       lfsck_object_put(env, parent);
-                       linkea_del_buf(ldata, cname);
-                       continue;
-               }
+       rc = dt_declare_delete(env, obj, (const struct dt_key *)dotdot, th);
+       if (rc != 0)
+               GOTO(stop, rc);
 
-               rc = dt_lookup(env, parent, (struct dt_rec *)tfid,
-                              (const struct dt_key *)cname->ln_name,
-                              BYPASS_CAPA);
-               *pfid2 = *lfsck_dto2fid(parent);
-               if (rc == -ENOENT) {
-                       lfsck_object_put(env, parent);
-                       linkea_next_entry(ldata);
-                       continue;
-               }
+       rec->rec_type = S_IFDIR;
+       rec->rec_fid = pfid;
+       rc = dt_declare_insert(env, obj, (const struct dt_rec *)rec,
+                              (const struct dt_key *)dotdot, th);
+       if (rc != 0)
+               GOTO(stop, rc);
 
-               if (rc != 0) {
-                       lfsck_object_put(env, parent);
+       rc = dt_declare_xattr_set(env, obj, &linkea_buf,
+                                 XATTR_NAME_LINK, 0, th);
+       if (rc != 0)
+               GOTO(stop, rc);
 
-                       RETURN(rc);
-               }
+       rc = dt_trans_start_local(env, dev, th);
+       if (rc != 0)
+               GOTO(stop, rc);
 
-               if (lu_fid_eq(tfid, cfid)) {
-                       lfsck_object_put(env, parent);
-                       if (!lu_fid_eq(pfid, pfid2)) {
-                               *type = LNIT_UNMATCHED_PAIRS;
-                               rc = lfsck_namespace_repair_unmatched_pairs(env,
-                                               com, child, pfid2, cname);
+       dt_write_lock(env, obj, 0);
+       if (unlikely(lfsck_is_dead_obj(obj)))
+               GOTO(unlock, rc = 0);
 
-                               RETURN(rc);
-                       }
+       if (lfsck->li_bookmark_ram.lb_param & LPF_DRYRUN)
+               GOTO(unlock, rc = 1);
 
-rebuild:
-                       /* It is the most common case that we find the
-                        * name entry corresponding to the linkEA entry
-                        * that matches the ".." name entry. */
-                       rc = linkea_data_new(&ldata_new, &info->lti_big_buf);
-                       if (rc != 0)
-                               RETURN(rc);
+       /* The old ".." name entry maybe not exist. */
+       dt_delete(env, obj, (const struct dt_key *)dotdot, th,
+                 BYPASS_CAPA);
 
-                       rc = linkea_add_buf(&ldata_new, cname, pfid2);
-                       if (rc != 0)
-                               RETURN(rc);
+       rc = dt_insert(env, obj, (const struct dt_rec *)rec,
+                      (const struct dt_key *)dotdot, th, BYPASS_CAPA, 1);
+       if (rc != 0)
+               GOTO(unlock, rc);
 
-                       rc = lfsck_namespace_rebuild_linkea(env, com, child,
-                                                           &ldata_new);
-                       if (rc < 0)
-                               RETURN(rc);
+       rc = dt_xattr_set(env, obj, &linkea_buf,
+                         XATTR_NAME_LINK, 0, th, BYPASS_CAPA);
 
-                       linkea_del_buf(ldata, cname);
-                       linkea_first_entry(ldata);
-                       /* There may be some invalid dangling name entries under
-                        * other parent directories, remove all of them. */
-                       while (ldata->ld_lee != NULL) {
-                               lfsck_namespace_unpack_linkea_entry(ldata,
-                                               cname, tfid, info->lti_key);
-                               if (!fid_is_sane(tfid))
-                                       goto next;
+       GOTO(unlock, rc = (rc == 0 ? 1 : rc));
 
-                               parent = lfsck_object_find_bottom(env, lfsck,
-                                                                 tfid);
-                               if (IS_ERR(parent)) {
-                                       rc = PTR_ERR(parent);
-                                       if (rc != -ENOENT &&
-                                           bk->lb_param & LPF_FAILOUT)
-                                               RETURN(rc);
+unlock:
+       dt_write_unlock(env, obj);
 
-                                       goto next;
-                               }
-
-                               if (!dt_object_exists(parent)) {
-                                       lfsck_object_put(env, parent);
-                                       goto next;
-                               }
-
-                               rc = lfsck_namespace_repair_dirent(env, com,
-                                       parent, child, cname->ln_name,
-                                       cname->ln_name, S_IFDIR, false, true);
-                               lfsck_object_put(env, parent);
-                               if (rc < 0) {
-                                       if (bk->lb_param & LPF_FAILOUT)
-                                               RETURN(rc);
-
-                                       goto next;
-                               }
-
-                               count += rc;
-
-next:
-                               linkea_del_buf(ldata, cname);
-                       }
-
-                       ns->ln_dirent_repaired += count;
-
-                       RETURN(rc);
-               }
+stop:
+       dt_trans_stop(env, dev, th);
 
-               lfsck_ibits_unlock(lh, LCK_EX);
-               /* The name entry references another MDT-object that may be
-                * created by the LFSCK for repairing dangling name entry.
-                * Try to replace it. */
-               rc = lfsck_namespace_replace_cond(env, com, parent, child,
-                                                 tfid, cname);
-               lfsck_object_put(env, parent);
-               if (rc < 0)
-                       RETURN(rc);
+log:
+       CDEBUG(D_LFSCK, "%s: namespace LFSCK rebuild dotdot name entry for "
+              "the object "DFID", new parent "DFID": rc = %d\n",
+              lfsck_lfsck2name(lfsck), PFID(lfsck_dto2fid(obj)),
+              PFID(pfid), rc);
 
-               if (rc > 0)
-                       goto rebuild;
+       if (rc != 0) {
+               struct lfsck_namespace *ns = com->lc_file_ram;
 
-               linkea_del_buf(ldata, cname);
+               ns->ln_flags |= LF_INCONSISTENT;
        }
 
-       if (ldata->ld_leh->leh_reccount == 1) {
-               rc = lfsck_namespace_dsd_single(env, com, child, pfid, ldata,
-                                               lh, type, NULL);
-
-               RETURN(rc);
-       }
+       return rc;
+}
 
-       /* All linkEA entries are invalid and removed, then handle the @child
-        * as an orphan.*/
-       if (ldata->ld_leh->leh_reccount == 0) {
-               rc = lfsck_namespace_dsd_orphan(env, com, child, pfid, lh,
-                                               type);
+/**
+ * Handle orphan @obj during Double Scan Directory.
+ *
+ * Remove the @obj's current (invalid) linkEA entries, and insert
+ * it in the directory .lustre/lost+found/MDTxxxx/ with the name:
+ * ${FID}-${PFID}-D-${conflict_version}
+ *
+ * The caller should take the ldlm lock before the calling.
+ *
+ * \param[in] env      pointer to the thread context
+ * \param[in] com      pointer to the lfsck component
+ * \param[in] obj      pointer to the orphan object to be handled
+ * \param[in] pfid     the new fid for the object's ".." name entry
+ * \param[in,out] lh   ldlm lock handler for the given @obj
+ * \param[out] type    to tell the caller what the inconsistency is
+ *
+ * \retval             positive number for repaired cases
+ * \retval             0 if nothing to be repaired
+ * \retval             negative error number on failure
+ */
+static int
+lfsck_namespace_dsd_orphan(const struct lu_env *env,
+                          struct lfsck_component *com,
+                          struct dt_object *obj,
+                          const struct lu_fid *pfid,
+                          struct lustre_handle *lh,
+                          enum lfsck_namespace_inconsistency_type *type)
+{
+       struct lfsck_thread_info *info = lfsck_env_info(env);
+       struct lfsck_namespace   *ns   = com->lc_file_ram;
+       int                       rc;
+       ENTRY;
 
+       /* Remove the unrecognized linkEA. */
+       rc = lfsck_namespace_links_remove(env, com, obj);
+       lfsck_ibits_unlock(lh, LCK_EX);
+       if (rc < 0 && rc != -ENODATA)
                RETURN(rc);
-       }
 
-       linkea_first_entry(ldata);
-       /* If the dangling name entry for the orphan directory object has
-        * been remvoed, then just check whether the directory object is
-        * still under the .lustre/lost+found/MDTxxxx/ or not. */
-       if (lpf) {
-               lpf = false;
-               goto again;
-       }
+       *type = LNIT_MUL_REF;
 
-       /* There is no linkEA entry that matches the ".." name entry. Find
-        * the first linkEA entry that both parent and name entry exist to
-        * rebuild a new ".." name entry. */
-       if (once) {
-               once = false;
-               goto again;
-       }
+       /* If the LFSCK is marked as LF_INCOMPLETE, then means some MDT has
+        * ever tried to verify some remote MDT-object that resides on this
+        * MDT, but this MDT failed to respond such request. So means there
+        * may be some remote name entry on other MDT that references this
+        * object with another name, so we cannot know whether this linkEA
+        * is valid or not. So keep it there and maybe resolved when next
+        * LFSCK run. */
+       if (ns->ln_flags & LF_INCOMPLETE)
+               RETURN(0);
+
+       /* The unique linkEA is invalid, even if the ".." name entry may be
+        * valid, we still cannot know via which name entry this directory
+        * will be referenced. Then handle it as pure orphan. */
+       snprintf(info->lti_tmpbuf, sizeof(info->lti_tmpbuf),
+                "-"DFID, PFID(pfid));
+       rc = lfsck_namespace_insert_orphan(env, com, obj,
+                                          info->lti_tmpbuf, "D", NULL);
 
        RETURN(rc);
 }
 
 /**
- * Double scan the directory object for namespace LFSCK.
- *
- * This function will verify the <parent, child> pairs in the namespace tree:
- * the parent references the child via some name entry that should be in the
- * child's linkEA entry, the child should back references the parent via its
- * ".." name entry.
- *
- * The LFSCK will scan every linkEA entry in turn until find out the first
- * matched pairs. If found, then all other linkEA entries will be dropped.
- * If all the linkEA entries cannot match the ".." name entry, then there
- * are serveral possible cases:
- *
- * 1) If there is only one linkEA entry, then trust it as long as the PFID
- *    in the linkEA entry is valid.
- *
- * 2) If there are multiple linkEA entries, then try to find the linkEA
- *    that matches the ".." name entry. If found, then all other entries
- *    are invalid; otherwise, it is quite possible that the ".." name entry
- *    is corrupted. Under such case, the LFSCK will rebuild the ".." name
- *    entry according to the first valid linkEA entry (both the parent and
- *    the name entry should exist).
+ * Double Scan Directory object for single linkEA entry case.
  *
- * 3) If the directory object has no (valid) linkEA entry, then the
- *    directory object will be handled as pure orphan and inserted
- *    in the .lustre/lost+found/MDTxxxx/ with the name:
- *    ${self_FID}-${PFID}-D-${conflict_version}
+ * The given @child has unique linkEA entry. If the linkEA entry is valid,
+ * then check whether the name is in the namespace or not, if not, add the
+ * missing name entry back to namespace. If the linkEA entry is invalid,
+ * then remove it and insert the @child in the .lustre/lost+found/MDTxxxx/
+ * as an orphan.
  *
  * \param[in] env      pointer to the thread context
  * \param[in] com      pointer to the lfsck component
- * \param[in] child    pointer to the directory object to be handled
- * \param[in] flags    to indicate the specical checking on the @child
+ * \param[in] child    pointer to the directory to be double scanned
+ * \param[in] pfid     the FID corresponding to the ".." entry
+ * \param[in] ldata    pointer to the linkEA data for the given @child
+ * \param[in,out] lh   ldlm lock handler for the given @child
+ * \param[out] type    to tell the caller what the inconsistency is
+ * \param[in] retry    if found inconsistency, but the caller does not hold
+ *                     ldlm lock on the @child, then set @retry as true
  *
  * \retval             positive number for repaired cases
  * \retval             0 if nothing to be repaired
  * \retval             negative error number on failure
  */
-static int lfsck_namespace_double_scan_dir(const struct lu_env *env,
-                                          struct lfsck_component *com,
-                                          struct dt_object *child, __u8 flags)
+static int
+lfsck_namespace_dsd_single(const struct lu_env *env,
+                          struct lfsck_component *com,
+                          struct dt_object *child,
+                          const struct lu_fid *pfid,
+                          struct linkea_data *ldata,
+                          struct lustre_handle *lh,
+                          enum lfsck_namespace_inconsistency_type *type,
+                          bool *retry)
 {
        struct lfsck_thread_info *info          = lfsck_env_info(env);
+       struct lu_name           *cname         = &info->lti_name;
        const struct lu_fid      *cfid          = lfsck_dto2fid(child);
-       struct lu_fid            *pfid          = &info->lti_fid2;
+       struct lu_fid            *tfid          = &info->lti_fid3;
        struct lfsck_namespace   *ns            = com->lc_file_ram;
        struct lfsck_instance    *lfsck         = com->lc_lfsck;
-       struct lustre_handle      lh            = { 0 };
-       struct linkea_data        ldata         = { 0 };
-       bool                      unknown       = false;
-       bool                      lpf           = false;
-       bool                      retry         = false;
-       enum lfsck_namespace_inconsistency_type type = LNIT_BAD_LINKEA;
+       struct dt_object         *parent        = NULL;
+       struct lmv_mds_md_v1     *lmv;
        int                       rc            = 0;
        ENTRY;
 
-       LASSERT(!dt_object_remote(child));
-
-       if (!(lfsck->li_bookmark_ram.lb_param & LPF_ALL_TGT)) {
-               CDEBUG(D_LFSCK, "%s: some MDT(s) maybe NOT take part in the"
-                      "the namespace LFSCK, then the LFSCK cannot guarantee"
-                      "all the name entries have been verified in first-stage"
-                      "scanning. So have to skip orphan related handling for"
-                      "the directory object "DFID" with remote name entry\n",
-                      lfsck_lfsck2name(lfsck), PFID(cfid));
+       lfsck_namespace_unpack_linkea_entry(ldata, cname, tfid, info->lti_key);
+       /* The unique linkEA entry with bad parent will be handled as orphan. */
+       if (!fid_is_sane(tfid)) {
+               if (!lustre_handle_is_used(lh) && retry != NULL)
+                       *retry = true;
+               else
+                       rc = lfsck_namespace_dsd_orphan(env, com, child,
+                                                       pfid, lh, type);
 
-               RETURN(0);
+               GOTO(out, rc);
        }
 
-       if (unlikely(!dt_try_as_dir(env, child)))
-               GOTO(out, rc = -ENOTDIR);
-
-       /* We only take ldlm lock on the @child when required. When the
-        * logic comes here for the first time, it is always false. */
-       if (0) {
+       parent = lfsck_object_find_bottom(env, lfsck, tfid);
+       if (IS_ERR(parent))
+               GOTO(out, rc = PTR_ERR(parent));
 
-lock:
-               rc = lfsck_ibits_lock(env, lfsck, child, &lh,
-                                     MDS_INODELOCK_UPDATE |
-                                     MDS_INODELOCK_XATTR, LCK_EX);
-               if (rc != 0)
-                       GOTO(out, rc);
-       }
+       /* We trust the unique linkEA entry in spite of whether it matches the
+        * ".." name entry or not. Because even if the linkEA entry is wrong
+        * and the ".." name entry is right, we still cannot know via which
+        * name entry the child will be referenced, since all known entries
+        * have been verified during the first-stage scanning. */
+       if (!dt_object_exists(parent)) {
+               /* If the LFSCK is marked as LF_INCOMPLETE, then means some MDT
+                * has ever tried to verify some remote MDT-object that resides
+                * on this MDT, but this MDT failed to respond such request. So
+                * means there may be some remote name entry on other MDT that
+                * references this object with another name, so we cannot know
+                * whether this linkEA is valid or not. So keep it there and
+                * maybe resolved when next LFSCK run. */
+               if (ns->ln_flags & LF_INCOMPLETE)
+                       GOTO(out, rc = 0);
 
-       dt_read_lock(env, child, 0);
-       if (unlikely(lfsck_is_dead_obj(child))) {
-               dt_read_unlock(env, child);
+               if (!lustre_handle_is_used(lh) && retry != NULL) {
+                       *retry = true;
 
-               GOTO(out, rc = 0);
-       }
+                       GOTO(out, rc = 0);
+               }
 
-       rc = dt_lookup(env, child, (struct dt_rec *)pfid,
-                      (const struct dt_key *)dotdot, BYPASS_CAPA);
-       if (rc != 0) {
-               if (rc != -ENOENT && rc != -ENODATA && rc != -EINVAL) {
-                       dt_read_unlock(env, child);
+               lfsck_ibits_unlock(lh, LCK_EX);
 
+lost_parent:
+               lmv = &info->lti_lmv;
+               rc = lfsck_read_stripe_lmv(env, child, lmv);
+               if (rc != 0 && rc != -ENODATA)
                        GOTO(out, rc);
-               }
 
-               if (!lustre_handle_is_used(&lh)) {
-                       dt_read_unlock(env, child);
-                       goto lock;
+               if (rc == -ENODATA || lmv->lmv_magic != LMV_MAGIC_STRIPE) {
+                       lmv = NULL;
+               } else if (lfsck_shard_name_to_index(env,
+                                       cname->ln_name, cname->ln_namelen,
+                                       S_IFDIR, cfid) < 0) {
+                       /* It is an invalid name entry, we
+                        * cannot trust the parent also. */
+                       rc = lfsck_namespace_shrink_linkea(env, com, child,
+                                               ldata, cname, tfid, true);
+                       if (rc < 0)
+                               GOTO(out, rc);
+
+                       snprintf(info->lti_tmpbuf, sizeof(info->lti_tmpbuf),
+                                "-"DFID, PFID(pfid));
+                       rc = lfsck_namespace_insert_orphan(env, com, child,
+                                               info->lti_tmpbuf, "S", NULL);
+
+                       GOTO(out, rc);
                }
 
-               fid_zero(pfid);
-       } else if (lfsck->li_lpf_obj != NULL &&
-                  lu_fid_eq(pfid, lfsck_dto2fid(lfsck->li_lpf_obj))) {
-               lpf = true;
+               /* Create the lost parent as an orphan. */
+               rc = lfsck_namespace_create_orphan(env, com, parent, lmv);
+               if (rc >= 0) {
+                       /* Add the missing name entry to the parent. */
+                       rc = lfsck_namespace_insert_normal(env, com, parent,
+                                                       child, cname->ln_name);
+                       if (unlikely(rc == -EEXIST)) {
+                               /* Unfortunately, someone reused the name
+                                * under the parent by race. So we have
+                                * to remove the linkEA entry from
+                                * current child object. It means that the
+                                * LFSCK cannot recover the system
+                                * totally back to its original status,
+                                * but it is necessary to make the
+                                * current system to be consistent. */
+                               rc = lfsck_namespace_shrink_linkea(env,
+                                               com, child, ldata,
+                                               cname, tfid, true);
+                               if (rc >= 0) {
+                                       snprintf(info->lti_tmpbuf,
+                                                sizeof(info->lti_tmpbuf),
+                                                "-"DFID, PFID(pfid));
+                                       rc = lfsck_namespace_insert_orphan(env,
+                                               com, child, info->lti_tmpbuf,
+                                               "D", NULL);
+                               }
+                       }
+               }
+
+               GOTO(out, rc);
        }
 
-       rc = lfsck_links_read(env, child, &ldata);
-       dt_read_unlock(env, child);
-       if (rc != 0) {
-               if (rc != -ENODATA && rc != -EINVAL)
+       /* The unique linkEA entry with bad parent will be handled as orphan. */
+       if (unlikely(!dt_try_as_dir(env, parent))) {
+               if (!lustre_handle_is_used(lh) && retry != NULL)
+                       *retry = true;
+               else
+                       rc = lfsck_namespace_dsd_orphan(env, com, child,
+                                                       pfid, lh, type);
+
+               GOTO(out, rc);
+       }
+
+       rc = dt_lookup(env, parent, (struct dt_rec *)tfid,
+                      (const struct dt_key *)cname->ln_name, BYPASS_CAPA);
+       if (rc == -ENOENT) {
+               /* If the LFSCK is marked as LF_INCOMPLETE, then means some MDT
+                * has ever tried to verify some remote MDT-object that resides
+                * on this MDT, but this MDT failed to respond such request. So
+                * means there may be some remote name entry on other MDT that
+                * references this object with another name, so we cannot know
+                * whether this linkEA is valid or not. So keep it there and
+                * maybe resolved when next LFSCK run. */
+               if (ns->ln_flags & LF_INCOMPLETE)
+                       GOTO(out, rc = 0);
+
+               if (!lustre_handle_is_used(lh) && retry != NULL) {
+                       *retry = true;
+
+                       GOTO(out, rc = 0);
+               }
+
+               lfsck_ibits_unlock(lh, LCK_EX);
+               rc = lfsck_namespace_check_name(env, parent, child, cname);
+               if (rc == -ENOENT)
+                       goto lost_parent;
+
+               if (rc < 0)
                        GOTO(out, rc);
 
-               if (!lustre_handle_is_used(&lh))
-                       goto lock;
+               /* It is an invalid name entry, drop it. */
+               if (unlikely(rc > 0)) {
+                       rc = lfsck_namespace_shrink_linkea(env, com, child,
+                                               ldata, cname, tfid, true);
+                       if (rc >= 0) {
+                               snprintf(info->lti_tmpbuf,
+                                        sizeof(info->lti_tmpbuf),
+                                        "-"DFID, PFID(pfid));
+                               rc = lfsck_namespace_insert_orphan(env, com,
+                                       child, info->lti_tmpbuf, "D", NULL);
+                       }
 
-               if (rc == -EINVAL && !fid_is_zero(pfid)) {
-                       /* Remove the corrupted linkEA. */
-                       rc = lfsck_namespace_links_remove(env, com, child);
-                       if (rc == 0)
-                               /* Here, because of the crashed linkEA, we
-                                * cannot know whether there is some parent
-                                * that references the child directory via
-                                * some name entry or not. So keep it there,
-                                * when the LFSCK run next time, if there is
-                                * some parent that references this object,
-                                * then the LFSCK can rebuild the linkEA;
-                                * otherwise, this object will be handled
-                                * as orphan as above. */
-                               unknown = true;
-               } else {
-                       /* 1. If we have neither ".." nor linkEA,
-                        *    then it is an orphan.
+                       GOTO(out, rc);
+               }
+
+               /* Add the missing name entry back to the namespace. */
+               rc = lfsck_namespace_insert_normal(env, com, parent, child,
+                                                  cname->ln_name);
+               if (unlikely(rc == -ESTALE))
+                       /* It may happen when the remote object has been
+                        * removed, but the local MDT is not aware of that. */
+                       goto lost_parent;
+
+               if (unlikely(rc == -EEXIST)) {
+                       /* Unfortunately, someone reused the name under the
+                        * parent by race. So we have to remove the linkEA
+                        * entry from current child object. It means that the
+                        * LFSCK cannot recover the system totally back to
+                        * its original status, but it is necessary to make
+                        * the current system to be consistent.
                         *
-                        * 2. If we only have the ".." name entry,
-                        *    but no parent references this child
-                        *    directory, then handle it as orphan. */
-                       lfsck_ibits_unlock(&lh, LCK_EX);
-                       type = LNIT_MUL_REF;
-                       snprintf(info->lti_tmpbuf, sizeof(info->lti_tmpbuf),
-                                "-"DFID, PFID(pfid));
-                       rc = lfsck_namespace_insert_orphan(env, com, child,
-                                               info->lti_tmpbuf, "D", NULL);
+                        * It also may be because of the LFSCK found some
+                        * internal status of create operation. Under such
+                        * case, nothing to be done. */
+                       rc = lfsck_namespace_shrink_linkea_cond(env, com,
+                                       parent, child, ldata, cname, tfid);
+                       if (rc >= 0) {
+                               snprintf(info->lti_tmpbuf,
+                                        sizeof(info->lti_tmpbuf),
+                                        "-"DFID, PFID(pfid));
+                               rc = lfsck_namespace_insert_orphan(env, com,
+                                       child, info->lti_tmpbuf, "D", NULL);
+                       }
                }
 
                GOTO(out, rc);
        }
 
-       linkea_first_entry(&ldata);
-       /* This is the most common case: the object has unique linkEA entry. */
-       if (ldata.ld_leh->leh_reccount == 1) {
-               rc = lfsck_namespace_dsd_single(env, com, child, pfid, &ldata,
-                                               &lh, &type, &retry);
-               if (retry) {
-                       LASSERT(!lustre_handle_is_used(&lh));
+       if (rc != 0)
+               GOTO(out, rc);
 
-                       retry = false;
-                       goto lock;
+       if (!lu_fid_eq(tfid, cfid)) {
+               if (!lustre_handle_is_used(lh) && retry != NULL) {
+                       *retry = true;
+
+                       GOTO(out, rc = 0);
                }
 
+               lfsck_ibits_unlock(lh, LCK_EX);
+               /* The name entry references another MDT-object that
+                * may be created by the LFSCK for repairing dangling
+                * name entry. Try to replace it. */
+               rc = lfsck_namespace_replace_cond(env, com, parent, child,
+                                                 tfid, cname);
+               if (rc == 0)
+                       rc = lfsck_namespace_dsd_orphan(env, com, child,
+                                                       pfid, lh, type);
+
                GOTO(out, rc);
        }
 
-       if (!lustre_handle_is_used(&lh))
-               goto lock;
+       if (fid_is_zero(pfid))
+               GOTO(out, rc = 0);
 
-       if (unlikely(ldata.ld_leh->leh_reccount == 0)) {
-               rc = lfsck_namespace_dsd_orphan(env, com, child, pfid, &lh,
-                                               &type);
+       /* The ".." name entry is wrong, update it. */
+       if (!lu_fid_eq(pfid, lfsck_dto2fid(parent))) {
+               if (!lustre_handle_is_used(lh) && retry != NULL) {
+                       *retry = true;
 
-               GOTO(out, rc);
-       }
+                       GOTO(out, rc = 0);
+               }
 
-       /* When we come here, the cases usually like that:
-        * 1) The directory object has a corrupted linkEA entry. During the
-        *    first-stage scanning, the LFSCK cannot know such corruption,
-        *    then it appends the right linkEA entry according to the found
-        *    name entry after the bad one.
-        *
-        * 2) The directory object has a right linkEA entry. During the
-        *    first-stage scanning, the LFSCK finds some bad name entry,
-        *    but the LFSCK cannot aware that at that time, then it adds
-        *    the bad linkEA entry for further processing. */
-       rc = lfsck_namespace_dsd_multiple(env, com, child, pfid, &ldata,
-                                         &lh, &type, lpf);
+               *type = LNIT_UNMATCHED_PAIRS;
+               rc = lfsck_namespace_repair_unmatched_pairs(env, com, child,
+                                               lfsck_dto2fid(parent), cname);
+       }
 
        GOTO(out, rc);
 
 out:
-       lfsck_ibits_unlock(&lh, LCK_EX);
-       if (rc > 0) {
-               switch (type) {
-               case LNIT_BAD_LINKEA:
-                       ns->ln_linkea_repaired++;
-                       break;
-               case LNIT_UNMATCHED_PAIRS:
-                       ns->ln_unmatched_pairs_repaired++;
-                       break;
-               case LNIT_MUL_REF:
-                       ns->ln_mul_ref_repaired++;
-                       break;
-               default:
-                       break;
-               }
-       }
-
-       if (unknown)
-               ns->ln_unknown_inconsistency++;
+       if (parent != NULL && !IS_ERR(parent))
+               lfsck_object_put(env, parent);
 
        return rc;
 }
 
 /**
- * Double scan the MDT-object for namespace LFSCK.
+ * Double Scan Directory object for multiple linkEA entries case.
  *
- * If the MDT-object contains invalid or repeated linkEA entries, then drop
- * those entries from the linkEA; if the linkEA becomes empty or the object
- * has no linkEA, then it is an orphan and will be added into the directory
- * .lustre/lost+found/MDTxxxx/; if the remote parent is lost, then recreate
- * the remote parent; if the name entry corresponding to some linkEA entry
- * is lost, then add the name entry back to the namespace.
+ * The given @child has multiple linkEA entries. There is at most one linkEA
+ * entry will be valid, all the others will be removed. Firstly, the function
+ * will try to find out the linkEA entry for which the name entry exists under
+ * the given parent (@pfid). If there is no linkEA entry that matches the given
+ * ".." name entry, then tries to find out the first linkEA entry that both the
+ * parent and the name entry exist to rebuild a new ".." name entry.
  *
  * \param[in] env      pointer to the thread context
  * \param[in] com      pointer to the lfsck component
- * \param[in] child    pointer to the dt_object to be handled
- * \param[in] flags    some hints to indicate how the @child should be handled
+ * \param[in] child    pointer to the directory to be double scanned
+ * \param[in] pfid     the FID corresponding to the ".." entry
+ * \param[in] ldata    pointer to the linkEA data for the given @child
+ * \param[in,out] lh   ldlm lock handler for the given @child
+ * \param[out] type    to tell the caller what the inconsistency is
+ * \param[in] lpf      true if the ".." entry is under lost+found/MDTxxxx/
  *
  * \retval             positive number for repaired cases
  * \retval             0 if nothing to be repaired
  * \retval             negative error number on failure
  */
-static int lfsck_namespace_double_scan_one(const struct lu_env *env,
-                                          struct lfsck_component *com,
-                                          struct dt_object *child, __u8 flags)
+static int
+lfsck_namespace_dsd_multiple(const struct lu_env *env,
+                            struct lfsck_component *com,
+                            struct dt_object *child,
+                            const struct lu_fid *pfid,
+                            struct linkea_data *ldata,
+                            struct lustre_handle *lh,
+                            enum lfsck_namespace_inconsistency_type *type,
+                            bool lpf)
 {
-       struct lfsck_thread_info *info     = lfsck_env_info(env);
-       struct lu_attr           *la       = &info->lti_la;
-       struct lu_name           *cname    = &info->lti_name;
-       struct lu_fid            *pfid     = &info->lti_fid;
-       struct lu_fid            *cfid     = &info->lti_fid2;
-       struct lfsck_instance    *lfsck    = com->lc_lfsck;
-       struct lfsck_namespace   *ns       = com->lc_file_ram;
-       struct dt_object         *parent   = NULL;
-       struct linkea_data        ldata    = { 0 };
-       bool                      repaired = false;
-       int                       count    = 0;
-       int                       rc;
+       struct lfsck_thread_info *info          = lfsck_env_info(env);
+       struct lu_name           *cname         = &info->lti_name;
+       const struct lu_fid      *cfid          = lfsck_dto2fid(child);
+       struct lu_fid            *tfid          = &info->lti_fid3;
+       struct lu_fid            *pfid2         = &info->lti_fid4;
+       struct lfsck_namespace   *ns            = com->lc_file_ram;
+       struct lfsck_instance    *lfsck         = com->lc_lfsck;
+       struct lfsck_bookmark    *bk            = &lfsck->li_bookmark_ram;
+       struct dt_object         *parent        = NULL;
+       struct linkea_data        ldata_new     = { 0 };
+       int                       dirent_count  = 0;
+       int                       linkea_count  = 0;
+       int                       rc            = 0;
+       bool                      once          = true;
        ENTRY;
 
-       dt_read_lock(env, child, 0);
-       if (unlikely(lfsck_is_dead_obj(child))) {
-               dt_read_unlock(env, child);
+again:
+       while (ldata->ld_lee != NULL) {
+               lfsck_namespace_unpack_linkea_entry(ldata, cname, tfid,
+                                                   info->lti_key);
+               /* Drop repeated linkEA entries. */
+               lfsck_namespace_filter_linkea_entry(ldata, cname, tfid, true);
+               /* Drop invalid linkEA entry. */
+               if (!fid_is_sane(tfid)) {
+                       linkea_del_buf(ldata, cname);
+                       linkea_count++;
+                       continue;
+               }
 
-               RETURN(0);
-       }
+               /* If current dotdot is the .lustre/lost+found/MDTxxxx/,
+                * then it is possible that: the directry object has ever
+                * been lost, but its name entry was there. In the former
+                * LFSCK run, during the first-stage scanning, the LFSCK
+                * found the dangling name entry, but it did not recreate
+                * the lost object, and when moved to the second-stage
+                * scanning, some children objects of the lost directory
+                * object were found, then the LFSCK recreated such lost
+                * directory object as an orphan.
+                *
+                * When the LFSCK runs again, if the dangling name is still
+                * there, the LFSCK should move the orphan directory object
+                * back to the normal namespace. */
+               if (!lpf && !lu_fid_eq(pfid, tfid) && once) {
+                       linkea_next_entry(ldata);
+                       continue;
+               }
 
-       if (S_ISDIR(lfsck_object_type(child))) {
-               dt_read_unlock(env, child);
-               rc = lfsck_namespace_double_scan_dir(env, com, child, flags);
-
-               RETURN(rc);
-       }
-
-       rc = lfsck_links_read(env, child, &ldata);
-       dt_read_unlock(env, child);
-       if (rc != 0)
-               GOTO(out, rc);
-
-       linkea_first_entry(&ldata);
-       while (ldata.ld_lee != NULL) {
-               lfsck_namespace_unpack_linkea_entry(&ldata, cname, pfid,
-                                                   info->lti_key);
-               rc = lfsck_namespace_filter_linkea_entry(&ldata, cname, pfid,
-                                                        false);
-               /* Found repeated linkEA entries */
-               if (rc > 0) {
-                       rc = lfsck_namespace_shrink_linkea(env, com, child,
-                                               &ldata, cname, pfid, false);
-                       if (rc < 0)
-                               GOTO(out, rc);
-
-                       if (rc == 0)
-                               continue;
-
-                       repaired = true;
-
-                       /* fall through */
-               }
-
-               /* Invalid PFID in the linkEA entry. */
-               if (!fid_is_sane(pfid)) {
-                       rc = lfsck_namespace_shrink_linkea(env, com, child,
-                                               &ldata, cname, pfid, true);
-                       if (rc < 0)
-                               GOTO(out, rc);
-
-                       if (rc > 0)
-                               repaired = true;
-
-                       continue;
-               }
-
-               parent = lfsck_object_find_bottom(env, lfsck, pfid);
-               if (IS_ERR(parent))
-                       GOTO(out, rc = PTR_ERR(parent));
+               parent = lfsck_object_find_bottom(env, lfsck, tfid);
+               if (IS_ERR(parent))
+                       RETURN(PTR_ERR(parent));
 
                if (!dt_object_exists(parent)) {
-                       if (ldata.ld_leh->leh_reccount > 1) {
+                       lfsck_object_put(env, parent);
+                       if (ldata->ld_leh->leh_reccount > 1) {
                                /* If it is NOT the last linkEA entry, then
                                 * there is still other chance to make the
                                 * child to be visible via other parent, then
                                 * remove this linkEA entry. */
-                               rc = lfsck_namespace_shrink_linkea(env, com,
-                                       child, &ldata, cname, pfid, true);
-                       } else {
-                               /* Create the lost parent as an orphan. */
-                               rc = lfsck_namespace_create_orphan(env, com,
-                                                                  parent);
-                               if (rc < 0) {
-                                       lfsck_object_put(env, parent);
-
-                                       GOTO(out, rc);
-                               }
-
-                               if (rc > 0)
-                                       repaired = true;
-
-                               /* Add the missing name entry to the parent. */
-                               rc = lfsck_namespace_insert_normal(env, com,
-                                               parent, child, cname->ln_name);
-                               linkea_next_entry(&ldata);
+                               linkea_del_buf(ldata, cname);
+                               linkea_count++;
+                               continue;
                        }
 
-                       lfsck_object_put(env, parent);
-                       if (rc < 0)
-                               GOTO(out, rc);
-
-                       if (rc > 0)
-                               repaired = true;
-
-                       continue;
+                       break;
                }
 
                /* The linkEA entry with bad parent will be removed. */
                if (unlikely(!dt_try_as_dir(env, parent))) {
                        lfsck_object_put(env, parent);
-                       rc = lfsck_namespace_shrink_linkea(env, com, child,
-                                               &ldata, cname, pfid, true);
-                       if (rc < 0)
-                               GOTO(out, rc);
-
-                       if (rc > 0)
-                               repaired = true;
-
+                       linkea_del_buf(ldata, cname);
+                       linkea_count++;
                        continue;
                }
 
-               rc = dt_lookup(env, parent, (struct dt_rec *)cfid,
+               rc = dt_lookup(env, parent, (struct dt_rec *)tfid,
                               (const struct dt_key *)cname->ln_name,
                               BYPASS_CAPA);
-               if (rc != 0 && rc != -ENOENT) {
+               *pfid2 = *lfsck_dto2fid(parent);
+               if (rc == -ENOENT) {
                        lfsck_object_put(env, parent);
-
-                       GOTO(out, rc);
+                       linkea_next_entry(ldata);
+                       continue;
                }
 
-               if (rc == 0) {
-                       if (lu_fid_eq(cfid, lfsck_dto2fid(child))) {
-                               /* It is the most common case that we
-                                * find the name entry corresponding
-                                * to the linkEA entry. */
-                               lfsck_object_put(env, parent);
-                               linkea_next_entry(&ldata);
-                       } else {
-                               /* The name entry references another
-                                * MDT-object that may be created by
-                                * the LFSCK for repairing dangling
-                                * name entry. Try to replace it. */
-                               rc = lfsck_namespace_replace_cond(env, com,
-                                               parent, child, cfid, cname);
-                               lfsck_object_put(env, parent);
-                               if (rc < 0)
-                                       GOTO(out, rc);
+               if (rc != 0) {
+                       lfsck_object_put(env, parent);
 
-                               if (rc > 0) {
-                                       repaired = true;
-                                       linkea_next_entry(&ldata);
-                               } else {
-                                       rc = lfsck_namespace_shrink_linkea(env,
-                                                       com, child, &ldata,
-                                                       cname, pfid, true);
-                                       if (rc < 0)
-                                               GOTO(out, rc);
+                       RETURN(rc);
+               }
 
-                                       if (rc > 0)
-                                               repaired = true;
-                               }
+               if (lu_fid_eq(tfid, cfid)) {
+                       lfsck_object_put(env, parent);
+                       if (!lu_fid_eq(pfid, pfid2)) {
+                               *type = LNIT_UNMATCHED_PAIRS;
+                               rc = lfsck_namespace_repair_unmatched_pairs(env,
+                                               com, child, pfid2, cname);
+
+                               RETURN(rc);
                        }
 
-                       continue;
-               }
+rebuild:
+                       /* It is the most common case that we find the
+                        * name entry corresponding to the linkEA entry
+                        * that matches the ".." name entry. */
+                       rc = linkea_data_new(&ldata_new, &info->lti_big_buf);
+                       if (rc != 0)
+                               RETURN(rc);
 
-               rc = dt_attr_get(env, child, la, BYPASS_CAPA);
-               if (rc != 0)
-                       GOTO(out, rc);
+                       rc = linkea_add_buf(&ldata_new, cname, pfid2);
+                       if (rc != 0)
+                               RETURN(rc);
 
-               /* If there is no name entry in the parent dir and the object
-                * link count is less than the linkea entries count, then the
-                * linkea entry should be removed. */
-               if (ldata.ld_leh->leh_reccount > la->la_nlink) {
-                       rc = lfsck_namespace_shrink_linkea_cond(env, com,
-                                       parent, child, &ldata, cname, pfid);
-                       lfsck_object_put(env, parent);
+                       rc = lfsck_namespace_rebuild_linkea(env, com, child,
+                                                           &ldata_new);
                        if (rc < 0)
-                               GOTO(out, rc);
-
-                       if (rc > 0)
-                               repaired = true;
+                               RETURN(rc);
 
-                       continue;
-               }
+                       linkea_del_buf(ldata, cname);
+                       linkea_count++;
+                       linkea_first_entry(ldata);
+                       /* There may be some invalid dangling name entries under
+                        * other parent directories, remove all of them. */
+                       while (ldata->ld_lee != NULL) {
+                               lfsck_namespace_unpack_linkea_entry(ldata,
+                                               cname, tfid, info->lti_key);
+                               if (!fid_is_sane(tfid))
+                                       goto next;
 
-               /* Add the missing name entry back to the namespace. */
-               rc = lfsck_namespace_insert_normal(env, com, parent, child,
-                                                  cname->ln_name);
-               lfsck_object_put(env, parent);
-               if (rc < 0)
-                       GOTO(out, rc);
+                               parent = lfsck_object_find_bottom(env, lfsck,
+                                                                 tfid);
+                               if (IS_ERR(parent)) {
+                                       rc = PTR_ERR(parent);
+                                       if (rc != -ENOENT &&
+                                           bk->lb_param & LPF_FAILOUT)
+                                               RETURN(rc);
 
-               if (rc > 0)
-                       repaired = true;
+                                       goto next;
+                               }
 
-               linkea_next_entry(&ldata);
-       }
+                               if (!dt_object_exists(parent)) {
+                                       lfsck_object_put(env, parent);
+                                       goto next;
+                               }
 
-       GOTO(out, rc = 0);
+                               rc = lfsck_namespace_repair_dirent(env, com,
+                                       parent, child, cname->ln_name,
+                                       cname->ln_name, S_IFDIR, false, true);
+                               lfsck_object_put(env, parent);
+                               if (rc < 0) {
+                                       if (bk->lb_param & LPF_FAILOUT)
+                                               RETURN(rc);
 
-out:
-       if (rc < 0 && rc != -ENODATA)
-               return rc;
+                                       goto next;
+                               }
 
-       if (rc == 0) {
-               LASSERT(ldata.ld_leh != NULL);
+                               dirent_count += rc;
 
-               count = ldata.ld_leh->leh_reccount;
-       }
+next:
+                               linkea_del_buf(ldata, cname);
+                       }
 
-       if (count == 0) {
-               /* If the child becomes orphan, then insert it into
-                * the global .lustre/lost+found/MDTxxxx directory. */
-               rc = lfsck_namespace_insert_orphan(env, com, child, "", "O",
-                                                  &count);
-               if (rc < 0)
-                       return rc;
+                       ns->ln_dirent_repaired += dirent_count;
 
-               if (rc > 0) {
-                       ns->ln_mul_ref_repaired++;
-                       repaired = true;
+                       RETURN(rc);
                }
-       }
 
-       rc = dt_attr_get(env, child, la, BYPASS_CAPA);
-       if (rc != 0)
-               return rc;
+               lfsck_ibits_unlock(lh, LCK_EX);
+               /* The name entry references another MDT-object that may be
+                * created by the LFSCK for repairing dangling name entry.
+                * Try to replace it. */
+               rc = lfsck_namespace_replace_cond(env, com, parent, child,
+                                                 tfid, cname);
+               lfsck_object_put(env, parent);
+               if (rc < 0)
+                       RETURN(rc);
+
+               if (rc > 0)
+                       goto rebuild;
 
-       if (la->la_nlink != count) {
-               /* XXX: there will be other patch(es) for MDT-object
-                *      hard links verification. */
+               linkea_del_buf(ldata, cname);
        }
 
-       if (repaired) {
-               if (la->la_nlink > 1)
-                       ns->ln_mul_linked_repaired++;
+       linkea_first_entry(ldata);
+       if (ldata->ld_leh->leh_reccount == 1) {
+               rc = lfsck_namespace_dsd_single(env, com, child, pfid, ldata,
+                                               lh, type, NULL);
 
-               if (rc == 0)
-                       rc = 1;
-       }
+               if (rc == 0 && fid_is_zero(pfid) && linkea_count > 0)
+                       rc = lfsck_namespace_rebuild_linkea(env, com, child,
+                                                           ldata);
 
-       return rc;
-}
+               RETURN(rc);
+       }
 
-static void lfsck_namespace_dump_statistics(struct seq_file *m,
-                                           struct lfsck_namespace *ns,
-                                           __u64 checked_phase1,
-                                           __u64 checked_phase2,
-                                           __u32 time_phase1,
-                                           __u32 time_phase2)
-{
-       seq_printf(m, "checked_phase1: "LPU64"\n"
-                     "checked_phase2: "LPU64"\n"
-                     "updated_phase1: "LPU64"\n"
-                     "updated_phase2: "LPU64"\n"
-                     "failed_phase1: "LPU64"\n"
-                     "failed_phase2: "LPU64"\n"
-                     "directories: "LPU64"\n"
-                     "dirent_repaired: "LPU64"\n"
-                     "linkea_repaired: "LPU64"\n"
-                     "nlinks_repaired: "LPU64"\n"
-                     "lost_found: "LPU64"\n"
-                     "multiple_linked_checked: "LPU64"\n"
-                     "multiple_linked_repaired: "LPU64"\n"
-                     "unknown_inconsistency: "LPU64"\n"
-                     "unmatched_pairs_repaired: "LPU64"\n"
-                     "dangling_repaired: "LPU64"\n"
-                     "multiple_referenced_repaired: "LPU64"\n"
-                     "bad_file_type_repaired: "LPU64"\n"
-                     "success_count: %u\n"
-                     "run_time_phase1: %u seconds\n"
-                     "run_time_phase2: %u seconds\n",
-                     checked_phase1,
-                     checked_phase2,
-                     ns->ln_items_repaired,
-                     ns->ln_objs_repaired_phase2,
-                     ns->ln_items_failed,
-                     ns->ln_objs_failed_phase2,
-                     ns->ln_dirs_checked,
-                     ns->ln_dirent_repaired,
-                     ns->ln_linkea_repaired,
-                     ns->ln_objs_nlink_repaired,
-                     ns->ln_objs_lost_found,
-                     ns->ln_mul_linked_checked,
-                     ns->ln_mul_linked_repaired,
-                     ns->ln_unknown_inconsistency,
-                     ns->ln_unmatched_pairs_repaired,
-                     ns->ln_dangling_repaired,
-                     ns->ln_mul_ref_repaired,
-                     ns->ln_bad_type_repaired,
-                     ns->ln_success_count,
-                     time_phase1,
-                     time_phase2);
-}
+       /* All linkEA entries are invalid and removed, then handle the @child
+        * as an orphan.*/
+       if (ldata->ld_leh->leh_reccount == 0) {
+               rc = lfsck_namespace_dsd_orphan(env, com, child, pfid, lh,
+                                               type);
 
-/* namespace APIs */
+               RETURN(rc);
+       }
 
-static int lfsck_namespace_reset(const struct lu_env *env,
-                                struct lfsck_component *com, bool init)
-{
-       struct lfsck_instance   *lfsck = com->lc_lfsck;
-       struct lfsck_namespace  *ns    = com->lc_file_ram;
-       struct dt_object        *root;
-       struct dt_object        *dto;
-       int                      rc;
-       ENTRY;
+       /* If the dangling name entry for the orphan directory object has
+        * been remvoed, then just check whether the directory object is
+        * still under the .lustre/lost+found/MDTxxxx/ or not. */
+       if (lpf) {
+               lpf = false;
+               goto again;
+       }
 
-       root = dt_locate(env, lfsck->li_bottom, &lfsck->li_local_root_fid);
-       if (IS_ERR(root))
-               GOTO(log, rc = PTR_ERR(root));
+       /* There is no linkEA entry that matches the ".." name entry. Find
+        * the first linkEA entry that both parent and name entry exist to
+        * rebuild a new ".." name entry. */
+       if (once) {
+               once = false;
+               goto again;
+       }
 
-       if (unlikely(!dt_try_as_dir(env, root)))
-               GOTO(put, rc = -ENOTDIR);
+       RETURN(rc);
+}
 
-       down_write(&com->lc_sem);
-       if (init) {
-               memset(ns, 0, sizeof(*ns));
-       } else {
-               __u32 count = ns->ln_success_count;
-               __u64 last_time = ns->ln_time_last_complete;
+/**
+ * Repair the object's nlink attribute.
+ *
+ * If all the known name entries have been verified, then the object's hard
+ * link attribute should match the object's linkEA entries count unless the
+ * object's has too much hard link to be recorded in the linkEA. Such cases
+ * should have been marked in the LFSCK trace file. Otherwise, trust the
+ * linkEA to update the object's nlink attribute.
+ *
+ * \param[in] env      pointer to the thread context
+ * \param[in] com      pointer to the lfsck component
+ * \param[in] obj      pointer to the dt_object to be handled
+ * \param[in,out] la   pointer to buffer to object's attribute before
+ *                     and after the repairing
+ *
+ * \retval             positive number for repaired cases
+ * \retval             0 if nothing to be repaired
+ * \retval             negative error number on failure
+ */
+static int lfsck_namespace_repair_nlink(const struct lu_env *env,
+                                       struct lfsck_component *com,
+                                       struct dt_object *obj,
+                                       struct lu_attr *la)
+{
+       struct lfsck_thread_info        *info   = lfsck_env_info(env);
+       struct lu_fid                   *tfid   = &info->lti_fid3;
+       struct lfsck_namespace          *ns     = com->lc_file_ram;
+       struct lfsck_instance           *lfsck  = com->lc_lfsck;
+       struct dt_device                *dev    = lfsck->li_bottom;
+       const struct lu_fid             *cfid   = lfsck_dto2fid(obj);
+       struct dt_object                *child  = NULL;
+       struct thandle                  *th     = NULL;
+       struct linkea_data               ldata  = { 0 };
+       struct lustre_handle             lh     = { 0 };
+       __u32                            old    = la->la_nlink;
+       int                              rc     = 0;
+       __u8                             flags;
+       ENTRY;
 
-               memset(ns, 0, sizeof(*ns));
-               ns->ln_success_count = count;
-               ns->ln_time_last_complete = last_time;
-       }
-       ns->ln_magic = LFSCK_NAMESPACE_MAGIC;
-       ns->ln_status = LS_INIT;
+       LASSERT(!dt_object_remote(obj));
+       LASSERT(S_ISREG(lfsck_object_type(obj)));
 
-       rc = local_object_unlink(env, lfsck->li_bottom, root,
-                                lfsck_namespace_name);
+       child = lfsck_object_find_by_dev(env, dev, cfid);
+       if (IS_ERR(child))
+               GOTO(log, rc = PTR_ERR(child));
+
+       rc = lfsck_ibits_lock(env, lfsck, child, &lh,
+                             MDS_INODELOCK_UPDATE |
+                             MDS_INODELOCK_XATTR, LCK_EX);
        if (rc != 0)
-               GOTO(out, rc);
+               GOTO(log, rc);
 
-       lfsck_object_put(env, com->lc_obj);
-       com->lc_obj = NULL;
-       dto = local_index_find_or_create(env, lfsck->li_los, root,
-                                        lfsck_namespace_name,
-                                        S_IFREG | S_IRUGO | S_IWUSR,
-                                        &dt_lfsck_features);
-       if (IS_ERR(dto))
-               GOTO(out, rc = PTR_ERR(dto));
+       th = dt_trans_create(env, dev);
+       if (IS_ERR(th))
+               GOTO(log, rc = PTR_ERR(th));
 
-       com->lc_obj = dto;
-       rc = dto->do_ops->do_index_try(env, dto, &dt_lfsck_features);
+       la->la_valid = LA_NLINK;
+       rc = dt_declare_attr_set(env, child, la, th);
        if (rc != 0)
-               GOTO(out, rc);
-
-       rc = lfsck_namespace_store(env, com, true);
+               GOTO(stop, rc);
 
-       GOTO(out, rc);
+       rc = dt_trans_start_local(env, dev, th);
+       if (rc != 0)
+               GOTO(stop, rc);
 
-out:
-       up_write(&com->lc_sem);
+       dt_write_lock(env, child, 0);
+       /* If the LFSCK is marked as LF_INCOMPLETE, then means some MDT has
+        * ever tried to verify some remote MDT-object that resides on this
+        * MDT, but this MDT failed to respond such request. So means there
+        * may be some remote name entry on other MDT that references this
+        * object with another name, so we cannot know whether this linkEA
+        * is valid or not. So keep it there and maybe resolved when next
+        * LFSCK run. */
+       if (ns->ln_flags & LF_INCOMPLETE)
+               GOTO(unlock, rc = 0);
 
-put:
-       lu_object_put(env, &root->do_lu);
-log:
-       CDEBUG(D_LFSCK, "%s: namespace LFSCK reset: rc = %d\n",
-              lfsck_lfsck2name(lfsck), rc);
-       return rc;
-}
+       fid_cpu_to_be(tfid, cfid);
+       rc = dt_lookup(env, com->lc_obj, (struct dt_rec *)&flags,
+                      (const struct dt_key *)tfid, BYPASS_CAPA);
+       if (rc != 0)
+               GOTO(unlock, rc);
 
-static void
-lfsck_namespace_fail(const struct lu_env *env, struct lfsck_component *com,
-                    bool new_checked)
-{
-       struct lfsck_namespace *ns = com->lc_file_ram;
+       if (flags & LNTF_SKIP_NLINK)
+               GOTO(unlock, rc = 0);
 
-       down_write(&com->lc_sem);
-       if (new_checked)
-               com->lc_new_checked++;
-       lfsck_namespace_record_failure(env, com->lc_lfsck, ns);
-       up_write(&com->lc_sem);
-}
+       rc = dt_attr_get(env, child, la, BYPASS_CAPA);
+       if (rc != 0)
+               GOTO(unlock, rc = (rc == -ENOENT ? 0 : rc));
 
-static int lfsck_namespace_checkpoint(const struct lu_env *env,
-                                     struct lfsck_component *com, bool init)
-{
-       struct lfsck_instance   *lfsck = com->lc_lfsck;
-       struct lfsck_namespace  *ns    = com->lc_file_ram;
-       int                      rc;
+       rc = lfsck_links_read2(env, child, &ldata);
+       if (rc != 0)
+               GOTO(unlock, rc = (rc == -ENODATA ? 0 : rc));
 
-       if (!init) {
-               rc = lfsck_checkpoint_generic(env, com);
-               if (rc != 0)
-                       goto log;
-       }
+       if (la->la_nlink == ldata.ld_leh->leh_reccount ||
+           unlikely(la->la_nlink == 0))
+               GOTO(unlock, rc = 0);
 
-       down_write(&com->lc_sem);
-       if (init) {
-               ns->ln_pos_latest_start = lfsck->li_pos_checkpoint;
-       } else {
-               ns->ln_pos_last_checkpoint = lfsck->li_pos_checkpoint;
-               ns->ln_run_time_phase1 += cfs_duration_sec(cfs_time_current() +
-                               HALF_SEC - lfsck->li_time_last_checkpoint);
-               ns->ln_time_last_checkpoint = cfs_time_current_sec();
-               ns->ln_items_checked += com->lc_new_checked;
-               com->lc_new_checked = 0;
-       }
+       la->la_nlink = ldata.ld_leh->leh_reccount;
+       if (lfsck->li_bookmark_ram.lb_param & LPF_DRYRUN)
+               GOTO(unlock, rc = 1);
 
-       rc = lfsck_namespace_store(env, com, false);
-       up_write(&com->lc_sem);
+       rc = dt_attr_set(env, child, la, th, BYPASS_CAPA);
 
-log:
-       CDEBUG(D_LFSCK, "%s: namespace LFSCK checkpoint at the pos ["LPU64
-              ", "DFID", "LPX64"]: rc = %d\n", lfsck_lfsck2name(lfsck),
-              lfsck->li_pos_current.lp_oit_cookie,
-              PFID(&lfsck->li_pos_current.lp_dir_parent),
-              lfsck->li_pos_current.lp_dir_cookie, rc);
+       GOTO(unlock, rc = (rc == 0 ? 1 : rc));
 
-       return rc > 0 ? 0 : rc;
-}
+unlock:
+       dt_write_unlock(env, child);
 
-static int lfsck_namespace_prep(const struct lu_env *env,
-                               struct lfsck_component *com,
-                               struct lfsck_start_param *lsp)
-{
-       struct lfsck_instance   *lfsck  = com->lc_lfsck;
-       struct lfsck_namespace  *ns     = com->lc_file_ram;
-       struct lfsck_position   *pos    = &com->lc_pos_start;
-       int                      rc;
+stop:
+       dt_trans_stop(env, dev, th);
 
-       if (ns->ln_status == LS_COMPLETED) {
-               rc = lfsck_namespace_reset(env, com, false);
-               if (rc == 0)
-                       rc = lfsck_set_param(env, lfsck, lsp->lsp_start, true);
+log:
+       lfsck_ibits_unlock(&lh, LCK_EX);
+       if (child != NULL && !IS_ERR(child))
+               lfsck_object_put(env, child);
 
-               if (rc != 0) {
-                       CDEBUG(D_LFSCK, "%s: namespace LFSCK prep failed: "
-                              "rc = %d\n", lfsck_lfsck2name(lfsck), rc);
+       CDEBUG(D_LFSCK, "%s: namespace LFSCK repaired the object "DFID"'s "
+              "nlink count from %u to %u: rc = %d\n",
+              lfsck_lfsck2name(lfsck), PFID(cfid), old, la->la_nlink, rc);
 
-                       return rc;
-               }
-       }
+       if (rc != 0)
+               ns->ln_flags |= LF_INCONSISTENT;
 
-       down_write(&com->lc_sem);
-       ns->ln_time_latest_start = cfs_time_current_sec();
-       spin_lock(&lfsck->li_lock);
+       return rc;
+}
 
-       if (ns->ln_flags & LF_SCANNED_ONCE) {
-               if (!lfsck->li_drop_dryrun ||
-                   lfsck_pos_is_zero(&ns->ln_pos_first_inconsistent)) {
-                       ns->ln_status = LS_SCANNING_PHASE2;
-                       list_move_tail(&com->lc_link,
-                                      &lfsck->li_list_double_scan);
-                       if (!list_empty(&com->lc_link_dir))
-                               list_del_init(&com->lc_link_dir);
-                       lfsck_pos_set_zero(pos);
-               } else {
-                       ns->ln_status = LS_SCANNING_PHASE1;
-                       ns->ln_run_time_phase1 = 0;
-                       ns->ln_run_time_phase2 = 0;
-                       ns->ln_items_checked = 0;
-                       ns->ln_items_repaired = 0;
-                       ns->ln_items_failed = 0;
-                       ns->ln_dirs_checked = 0;
-                       ns->ln_objs_checked_phase2 = 0;
-                       ns->ln_objs_repaired_phase2 = 0;
-                       ns->ln_objs_failed_phase2 = 0;
-                       ns->ln_objs_nlink_repaired = 0;
-                       ns->ln_objs_lost_found = 0;
-                       ns->ln_dirent_repaired = 0;
-                       ns->ln_linkea_repaired = 0;
-                       ns->ln_mul_linked_checked = 0;
-                       ns->ln_mul_linked_repaired = 0;
-                       ns->ln_unknown_inconsistency = 0;
-                       ns->ln_unmatched_pairs_repaired = 0;
-                       ns->ln_dangling_repaired = 0;
-                       ns->ln_mul_ref_repaired = 0;
-                       ns->ln_bad_type_repaired = 0;
-                       fid_zero(&ns->ln_fid_latest_scanned_phase2);
-                       if (list_empty(&com->lc_link_dir))
-                               list_add_tail(&com->lc_link_dir,
-                                             &lfsck->li_list_dir);
-                       *pos = ns->ln_pos_first_inconsistent;
-               }
-       } else {
-               ns->ln_status = LS_SCANNING_PHASE1;
-               if (list_empty(&com->lc_link_dir))
-                       list_add_tail(&com->lc_link_dir,
-                                     &lfsck->li_list_dir);
-               if (!lfsck->li_drop_dryrun ||
-                   lfsck_pos_is_zero(&ns->ln_pos_first_inconsistent)) {
-                       *pos = ns->ln_pos_last_checkpoint;
-                       pos->lp_oit_cookie++;
+/**
+ * Double scan the directory object for namespace LFSCK.
+ *
+ * This function will verify the <parent, child> pairs in the namespace tree:
+ * the parent references the child via some name entry that should be in the
+ * child's linkEA entry, the child should back references the parent via its
+ * ".." name entry.
+ *
+ * The LFSCK will scan every linkEA entry in turn until find out the first
+ * matched pairs. If found, then all other linkEA entries will be dropped.
+ * If all the linkEA entries cannot match the ".." name entry, then there
+ * are serveral possible cases:
+ *
+ * 1) If there is only one linkEA entry, then trust it as long as the PFID
+ *    in the linkEA entry is valid.
+ *
+ * 2) If there are multiple linkEA entries, then try to find the linkEA
+ *    that matches the ".." name entry. If found, then all other entries
+ *    are invalid; otherwise, it is quite possible that the ".." name entry
+ *    is corrupted. Under such case, the LFSCK will rebuild the ".." name
+ *    entry according to the first valid linkEA entry (both the parent and
+ *    the name entry should exist).
+ *
+ * 3) If the directory object has no (valid) linkEA entry, then the
+ *    directory object will be handled as pure orphan and inserted
+ *    in the .lustre/lost+found/MDTxxxx/ with the name:
+ *    ${self_FID}-${PFID}-D-${conflict_version}
+ *
+ * \param[in] env      pointer to the thread context
+ * \param[in] com      pointer to the lfsck component
+ * \param[in] child    pointer to the directory object to be handled
+ * \param[in] flags    to indicate the specical checking on the @child
+ *
+ * \retval             positive number for repaired cases
+ * \retval             0 if nothing to be repaired
+ * \retval             negative error number on failure
+ */
+static int lfsck_namespace_double_scan_dir(const struct lu_env *env,
+                                          struct lfsck_component *com,
+                                          struct dt_object *child, __u8 flags)
+{
+       struct lfsck_thread_info *info          = lfsck_env_info(env);
+       const struct lu_fid      *cfid          = lfsck_dto2fid(child);
+       struct lu_fid            *pfid          = &info->lti_fid2;
+       struct lfsck_namespace   *ns            = com->lc_file_ram;
+       struct lfsck_instance    *lfsck         = com->lc_lfsck;
+       struct lustre_handle      lh            = { 0 };
+       struct linkea_data        ldata         = { 0 };
+       bool                      unknown       = false;
+       bool                      lpf           = false;
+       bool                      retry         = false;
+       enum lfsck_namespace_inconsistency_type type = LNIT_BAD_LINKEA;
+       int                       rc            = 0;
+       ENTRY;
+
+       LASSERT(!dt_object_remote(child));
+
+       if (flags & LNTF_UNCERTAIN_LMV) {
+               if (flags & LNTF_RECHECK_NAME_HASH) {
+                       rc = lfsck_namespace_scan_shard(env, com, child);
+                       if (rc < 0)
+                               RETURN(rc);
+
+                       ns->ln_striped_shards_scanned++;
                } else {
-                       *pos = ns->ln_pos_first_inconsistent;
+                       ns->ln_striped_shards_skipped++;
                }
        }
 
-       spin_unlock(&lfsck->li_lock);
-       up_write(&com->lc_sem);
+       flags &= ~(LNTF_RECHECK_NAME_HASH | LNTF_UNCERTAIN_LMV);
+       if (flags == 0)
+               RETURN(0);
 
-       rc = lfsck_start_assistant(env, com, lsp);
+       if (flags & (LNTF_CHECK_LINKEA | LNTF_CHECK_PARENT) &&
+           !(lfsck->li_bookmark_ram.lb_param & LPF_ALL_TGT)) {
+               CDEBUG(D_LFSCK, "%s: some MDT(s) maybe NOT take part in the"
+                      "the namespace LFSCK, then the LFSCK cannot guarantee"
+                      "all the name entries have been verified in first-stage"
+                      "scanning. So have to skip orphan related handling for"
+                      "the directory object "DFID" with remote name entry\n",
+                      lfsck_lfsck2name(lfsck), PFID(cfid));
 
-       CDEBUG(D_LFSCK, "%s: namespace LFSCK prep done, start pos ["LPU64", "
-              DFID", "LPX64"]: rc = %d\n",
-              lfsck_lfsck2name(lfsck), pos->lp_oit_cookie,
-              PFID(&pos->lp_dir_parent), pos->lp_dir_cookie, rc);
+               RETURN(0);
+       }
 
-       return rc;
-}
+       if (unlikely(!dt_try_as_dir(env, child)))
+               GOTO(out, rc = -ENOTDIR);
 
-static int lfsck_namespace_exec_oit(const struct lu_env *env,
-                                   struct lfsck_component *com,
-                                   struct dt_object *obj)
-{
-       struct lfsck_thread_info *info  = lfsck_env_info(env);
-       struct lfsck_namespace   *ns    = com->lc_file_ram;
-       struct lfsck_instance    *lfsck = com->lc_lfsck;
-       const struct lu_fid      *fid   = lfsck_dto2fid(obj);
-       struct lu_attr           *la    = &info->lti_la;
-       struct lu_fid            *pfid  = &info->lti_fid2;
-       struct lu_name           *cname = &info->lti_name;
-       struct lu_seq_range      *range = &info->lti_range;
-       struct dt_device         *dev   = lfsck->li_bottom;
-       struct seq_server_site   *ss    =
-                               lu_site2seq(dev->dd_lu_dev.ld_site);
-       struct linkea_data        ldata = { 0 };
-       __u32                     idx   = lfsck_dev_idx(dev);
-       int                       rc;
-       ENTRY;
+       /* We only take ldlm lock on the @child when required. When the
+        * logic comes here for the first time, it is always false. */
+       if (0) {
+
+lock:
+               rc = lfsck_ibits_lock(env, lfsck, child, &lh,
+                                     MDS_INODELOCK_UPDATE |
+                                     MDS_INODELOCK_XATTR, LCK_EX);
+               if (rc != 0)
+                       GOTO(out, rc);
+       }
+
+       dt_read_lock(env, child, 0);
+       if (unlikely(lfsck_is_dead_obj(child))) {
+               dt_read_unlock(env, child);
 
-       rc = lfsck_links_read(env, obj, &ldata);
-       if (rc == -ENOENT)
                GOTO(out, rc = 0);
+       }
 
-       /* -EINVAL means crashed linkEA, should be verified. */
-       if (rc == -EINVAL) {
-               rc = lfsck_namespace_trace_update(env, com, fid,
-                                                 LNTF_CHECK_LINKEA, true);
-               if (rc == 0) {
-                       struct lustre_handle lh = { 0 };
+       rc = dt_lookup(env, child, (struct dt_rec *)pfid,
+                      (const struct dt_key *)dotdot, BYPASS_CAPA);
+       if (rc != 0) {
+               if (rc != -ENOENT && rc != -ENODATA && rc != -EINVAL) {
+                       dt_read_unlock(env, child);
 
-                       rc = lfsck_ibits_lock(env, lfsck, obj, &lh,
-                                             MDS_INODELOCK_UPDATE |
-                                             MDS_INODELOCK_XATTR, LCK_EX);
-                       if (rc == 0) {
-                               rc = lfsck_namespace_links_remove(env, com,
-                                                                 obj);
-                               lfsck_ibits_unlock(&lh, LCK_EX);
-                       }
+                       GOTO(out, rc);
                }
 
-               GOTO(out, rc = (rc == -ENOENT ? 0 : rc));
-       }
+               if (!lustre_handle_is_used(&lh)) {
+                       dt_read_unlock(env, child);
+                       goto lock;
+               }
 
-       /* zero-linkEA object may be orphan, but it also maybe because
-        * of upgrading. Currently, we cannot record it for double scan.
-        * Because it may cause the LFSCK tracing file to be too large. */
-       if (rc == -ENODATA) {
-               if (S_ISDIR(lfsck_object_type(obj)))
-                       GOTO(out, rc = 0);
+               fid_zero(pfid);
+       } else if (lfsck->li_lpf_obj != NULL &&
+                  lu_fid_eq(pfid, lfsck_dto2fid(lfsck->li_lpf_obj))) {
+               lpf = true;
+       } else if (unlikely(!fid_is_sane(pfid))) {
+               fid_zero(pfid);
+       }
 
-               rc = dt_attr_get(env, obj, la, BYPASS_CAPA);
-               if (rc != 0)
+       rc = lfsck_links_read(env, child, &ldata);
+       dt_read_unlock(env, child);
+       if (rc != 0) {
+               if (rc != -ENODATA && rc != -EINVAL)
                        GOTO(out, rc);
 
-               if (la->la_nlink > 1)
-                       rc = lfsck_namespace_trace_update(env, com, fid,
-                                               LNTF_CHECK_LINKEA, true);
+               if (!lustre_handle_is_used(&lh))
+                       goto lock;
+
+               if (rc == -EINVAL && !fid_is_zero(pfid)) {
+                       /* Remove the corrupted linkEA. */
+                       rc = lfsck_namespace_links_remove(env, com, child);
+                       if (rc == 0)
+                               /* Here, because of the crashed linkEA, we
+                                * cannot know whether there is some parent
+                                * that references the child directory via
+                                * some name entry or not. So keep it there,
+                                * when the LFSCK run next time, if there is
+                                * some parent that references this object,
+                                * then the LFSCK can rebuild the linkEA;
+                                * otherwise, this object will be handled
+                                * as orphan as above. */
+                               unknown = true;
+               } else {
+                       /* 1. If we have neither ".." nor linkEA,
+                        *    then it is an orphan.
+                        *
+                        * 2. If we only have the ".." name entry,
+                        *    but no parent references this child
+                        *    directory, then handle it as orphan. */
+                       lfsck_ibits_unlock(&lh, LCK_EX);
+                       type = LNIT_MUL_REF;
+
+                       /* If the LFSCK is marked as LF_INCOMPLETE,
+                        * then means some MDT has ever tried to
+                        * verify some remote MDT-object that resides
+                        * on this MDT, but this MDT failed to respond
+                        * such request. So means there may be some
+                        * remote name entry on other MDT that
+                        * references this object with another name,
+                        * so we cannot know whether this linkEA is
+                        * valid or not. So keep it there and maybe
+                        * resolved when next LFSCK run. */
+                       if (ns->ln_flags & LF_INCOMPLETE)
+                               GOTO(out, rc = 0);
+
+                       snprintf(info->lti_tmpbuf, sizeof(info->lti_tmpbuf),
+                                "-"DFID, PFID(pfid));
+                       rc = lfsck_namespace_insert_orphan(env, com, child,
+                                               info->lti_tmpbuf, "D", NULL);
+               }
 
                GOTO(out, rc);
        }
 
-       if (rc != 0)
+       linkea_first_entry(&ldata);
+       /* This is the most common case: the object has unique linkEA entry. */
+       if (ldata.ld_leh->leh_reccount == 1) {
+               rc = lfsck_namespace_dsd_single(env, com, child, pfid, &ldata,
+                                               &lh, &type, &retry);
+               if (retry) {
+                       LASSERT(!lustre_handle_is_used(&lh));
+
+                       retry = false;
+                       goto lock;
+               }
+
                GOTO(out, rc);
+       }
 
-       /* Record multiple-linked object. */
-       if (ldata.ld_leh->leh_reccount > 1) {
-               rc = lfsck_namespace_trace_update(env, com, fid,
-                                                 LNTF_CHECK_LINKEA, true);
+       if (!lustre_handle_is_used(&lh))
+               goto lock;
+
+       if (unlikely(ldata.ld_leh->leh_reccount == 0)) {
+               rc = lfsck_namespace_dsd_orphan(env, com, child, pfid, &lh,
+                                               &type);
 
                GOTO(out, rc);
        }
 
-       linkea_first_entry(&ldata);
-       linkea_entry_unpack(ldata.ld_lee, &ldata.ld_reclen, cname, pfid);
-       if (!fid_is_sane(pfid)) {
-               rc = lfsck_namespace_trace_update(env, com, fid,
-                                                 LNTF_CHECK_PARENT, true);
-       } else {
-               fld_range_set_mdt(range);
-               rc = fld_local_lookup(env, ss->ss_server_fld,
-                                     fid_seq(pfid), range);
-               if ((rc == -ENOENT) ||
-                   (rc == 0 && range->lsr_index != idx)) {
-                       rc = lfsck_namespace_trace_update(env, com, fid,
-                                               LNTF_CHECK_LINKEA, true);
-               } else {
-                       if (S_ISDIR(lfsck_object_type(obj)))
-                               GOTO(out, rc = 0);
+       /* When we come here, the cases usually like that:
+        * 1) The directory object has a corrupted linkEA entry. During the
+        *    first-stage scanning, the LFSCK cannot know such corruption,
+        *    then it appends the right linkEA entry according to the found
+        *    name entry after the bad one.
+        *
+        * 2) The directory object has a right linkEA entry. During the
+        *    first-stage scanning, the LFSCK finds some bad name entry,
+        *    but the LFSCK cannot aware that at that time, then it adds
+        *    the bad linkEA entry for further processing. */
+       rc = lfsck_namespace_dsd_multiple(env, com, child, pfid, &ldata,
+                                         &lh, &type, lpf);
 
-                       rc = dt_attr_get(env, obj, la, BYPASS_CAPA);
-                       if (rc != 0)
-                               GOTO(out, rc);
+       GOTO(out, rc);
 
-                       if (la->la_nlink > 1)
-                               rc = lfsck_namespace_trace_update(env, com,
-                                               fid, LNTF_CHECK_LINKEA, true);
+out:
+       lfsck_ibits_unlock(&lh, LCK_EX);
+       if (rc > 0) {
+               switch (type) {
+               case LNIT_BAD_LINKEA:
+                       ns->ln_linkea_repaired++;
+                       break;
+               case LNIT_UNMATCHED_PAIRS:
+                       ns->ln_unmatched_pairs_repaired++;
+                       break;
+               case LNIT_MUL_REF:
+                       ns->ln_mul_ref_repaired++;
+                       break;
+               default:
+                       break;
                }
        }
 
-       GOTO(out, rc);
-
-out:
-       down_write(&com->lc_sem);
-       com->lc_new_checked++;
-       if (S_ISDIR(lfsck_object_type(obj)))
-               ns->ln_dirs_checked++;
-       if (rc != 0)
-               lfsck_namespace_record_failure(env, com->lc_lfsck, ns);
-       up_write(&com->lc_sem);
+       if (unknown)
+               ns->ln_unknown_inconsistency++;
 
        return rc;
 }
 
-static int lfsck_namespace_exec_dir(const struct lu_env *env,
-                                   struct lfsck_component *com,
-                                   struct lu_dirent *ent, __u16 type)
+/**
+ * Double scan the MDT-object for namespace LFSCK.
+ *
+ * If the MDT-object contains invalid or repeated linkEA entries, then drop
+ * those entries from the linkEA; if the linkEA becomes empty or the object
+ * has no linkEA, then it is an orphan and will be added into the directory
+ * .lustre/lost+found/MDTxxxx/; if the remote parent is lost, then recreate
+ * the remote parent; if the name entry corresponding to some linkEA entry
+ * is lost, then add the name entry back to the namespace.
+ *
+ * \param[in] env      pointer to the thread context
+ * \param[in] com      pointer to the lfsck component
+ * \param[in] child    pointer to the dt_object to be handled
+ * \param[in] flags    some hints to indicate how the @child should be handled
+ *
+ * \retval             positive number for repaired cases
+ * \retval             0 if nothing to be repaired
+ * \retval             negative error number on failure
+ */
+static int lfsck_namespace_double_scan_one(const struct lu_env *env,
+                                          struct lfsck_component *com,
+                                          struct dt_object *child, __u8 flags)
 {
-       struct lfsck_assistant_data     *lad    = com->lc_data;
-       struct lfsck_namespace_req      *lnr;
-       bool                             wakeup = false;
-
-       lnr = lfsck_namespace_assistant_req_init(com->lc_lfsck, ent, type);
-       if (IS_ERR(lnr)) {
-               struct lfsck_namespace *ns = com->lc_file_ram;
+       struct lfsck_thread_info *info     = lfsck_env_info(env);
+       struct lu_attr           *la       = &info->lti_la;
+       struct lu_name           *cname    = &info->lti_name;
+       struct lu_fid            *pfid     = &info->lti_fid;
+       struct lu_fid            *cfid     = &info->lti_fid2;
+       struct lfsck_instance    *lfsck    = com->lc_lfsck;
+       struct lfsck_namespace   *ns       = com->lc_file_ram;
+       struct dt_object         *parent   = NULL;
+       struct linkea_data        ldata    = { 0 };
+       bool                      repaired = false;
+       int                       count    = 0;
+       int                       rc;
+       ENTRY;
 
-               lfsck_namespace_record_failure(env, com->lc_lfsck, ns);
-               return PTR_ERR(lnr);
-       }
+       dt_read_lock(env, child, 0);
+       if (unlikely(lfsck_is_dead_obj(child))) {
+               dt_read_unlock(env, child);
 
-       spin_lock(&lad->lad_lock);
-       if (lad->lad_assistant_status < 0) {
-               spin_unlock(&lad->lad_lock);
-               lfsck_namespace_assistant_req_fini(env, &lnr->lnr_lar);
-               return lad->lad_assistant_status;
+               RETURN(0);
        }
 
-       list_add_tail(&lnr->lnr_lar.lar_list, &lad->lad_req_list);
-       if (lad->lad_prefetched == 0)
-               wakeup = true;
+       if (S_ISDIR(lfsck_object_type(child))) {
+               dt_read_unlock(env, child);
+               rc = lfsck_namespace_double_scan_dir(env, com, child, flags);
 
-       lad->lad_prefetched++;
-       spin_unlock(&lad->lad_lock);
-       if (wakeup)
-               wake_up_all(&lad->lad_thread.t_ctl_waitq);
+               RETURN(rc);
+       }
 
-       down_write(&com->lc_sem);
-       com->lc_new_checked++;
-       up_write(&com->lc_sem);
+       rc = lfsck_links_read(env, child, &ldata);
+       dt_read_unlock(env, child);
+       if (rc != 0)
+               GOTO(out, rc);
 
-       return 0;
-}
+       linkea_first_entry(&ldata);
+       while (ldata.ld_lee != NULL) {
+               lfsck_namespace_unpack_linkea_entry(&ldata, cname, pfid,
+                                                   info->lti_key);
+               rc = lfsck_namespace_filter_linkea_entry(&ldata, cname, pfid,
+                                                        false);
+               /* Found repeated linkEA entries */
+               if (rc > 0) {
+                       rc = lfsck_namespace_shrink_linkea(env, com, child,
+                                               &ldata, cname, pfid, false);
+                       if (rc < 0)
+                               GOTO(out, rc);
 
-static int lfsck_namespace_post(const struct lu_env *env,
-                               struct lfsck_component *com,
-                               int result, bool init)
-{
-       struct lfsck_instance   *lfsck = com->lc_lfsck;
-       struct lfsck_namespace  *ns    = com->lc_file_ram;
-       int                      rc;
-       ENTRY;
+                       if (rc == 0)
+                               continue;
 
-       lfsck_post_generic(env, com, &result);
+                       repaired = true;
 
-       down_write(&com->lc_sem);
-       spin_lock(&lfsck->li_lock);
-       if (!init)
-               ns->ln_pos_last_checkpoint = lfsck->li_pos_checkpoint;
-       if (result > 0) {
-               ns->ln_status = LS_SCANNING_PHASE2;
-               ns->ln_flags |= LF_SCANNED_ONCE;
-               ns->ln_flags &= ~LF_UPGRADE;
-               list_del_init(&com->lc_link_dir);
-               list_move_tail(&com->lc_link, &lfsck->li_list_double_scan);
-       } else if (result == 0) {
-               ns->ln_status = lfsck->li_status;
-               if (ns->ln_status == 0)
-                       ns->ln_status = LS_STOPPED;
-               if (ns->ln_status != LS_PAUSED) {
-                       list_del_init(&com->lc_link_dir);
-                       list_move_tail(&com->lc_link, &lfsck->li_list_idle);
+                       /* fall through */
                }
-       } else {
-               ns->ln_status = LS_FAILED;
-               list_del_init(&com->lc_link_dir);
-               list_move_tail(&com->lc_link, &lfsck->li_list_idle);
-       }
-       spin_unlock(&lfsck->li_lock);
 
-       if (!init) {
-               ns->ln_run_time_phase1 += cfs_duration_sec(cfs_time_current() +
-                               HALF_SEC - lfsck->li_time_last_checkpoint);
-               ns->ln_time_last_checkpoint = cfs_time_current_sec();
-               ns->ln_items_checked += com->lc_new_checked;
-               com->lc_new_checked = 0;
-       }
+               /* Invalid PFID in the linkEA entry. */
+               if (!fid_is_sane(pfid)) {
+                       rc = lfsck_namespace_shrink_linkea(env, com, child,
+                                               &ldata, cname, pfid, true);
+                       if (rc < 0)
+                               GOTO(out, rc);
 
-       rc = lfsck_namespace_store(env, com, false);
-       up_write(&com->lc_sem);
+                       if (rc > 0)
+                               repaired = true;
 
-       CDEBUG(D_LFSCK, "%s: namespace LFSCK post done: rc = %d\n",
-              lfsck_lfsck2name(lfsck), rc);
+                       continue;
+               }
 
-       RETURN(rc);
-}
+               parent = lfsck_object_find_bottom(env, lfsck, pfid);
+               if (IS_ERR(parent))
+                       GOTO(out, rc = PTR_ERR(parent));
 
-static int
-lfsck_namespace_dump(const struct lu_env *env, struct lfsck_component *com,
-                    struct seq_file *m)
-{
-       struct lfsck_instance   *lfsck = com->lc_lfsck;
-       struct lfsck_bookmark   *bk    = &lfsck->li_bookmark_ram;
-       struct lfsck_namespace  *ns    = com->lc_file_ram;
-       int                      rc;
+               if (!dt_object_exists(parent)) {
 
-       down_read(&com->lc_sem);
-       seq_printf(m, "name: lfsck_namespace\n"
-                  "magic: %#x\n"
-                  "version: %d\n"
-                  "status: %s\n",
-                  ns->ln_magic,
-                  bk->lb_version,
-                  lfsck_status2names(ns->ln_status));
+lost_parent:
+                       if (ldata.ld_leh->leh_reccount > 1) {
+                               /* If it is NOT the last linkEA entry, then
+                                * there is still other chance to make the
+                                * child to be visible via other parent, then
+                                * remove this linkEA entry. */
+                               rc = lfsck_namespace_shrink_linkea(env, com,
+                                       child, &ldata, cname, pfid, true);
+                       } else {
+                               /* If the LFSCK is marked as LF_INCOMPLETE,
+                                * then means some MDT has ever tried to
+                                * verify some remote MDT-object that resides
+                                * on this MDT, but this MDT failed to respond
+                                * such request. So means there may be some
+                                * remote name entry on other MDT that
+                                * references this object with another name,
+                                * so we cannot know whether this linkEA is
+                                * valid or not. So keep it there and maybe
+                                * resolved when next LFSCK run. */
+                               if (ns->ln_flags & LF_INCOMPLETE) {
+                                       lfsck_object_put(env, parent);
 
-       rc = lfsck_bits_dump(m, ns->ln_flags, lfsck_flags_names, "flags");
-       if (rc < 0)
-               goto out;
+                                       GOTO(out, rc = 0);
+                               }
 
-       rc = lfsck_bits_dump(m, bk->lb_param, lfsck_param_names, "param");
-       if (rc < 0)
-               goto out;
+                               /* Create the lost parent as an orphan. */
+                               rc = lfsck_namespace_create_orphan(env, com,
+                                                               parent, NULL);
+                               if (rc < 0) {
+                                       lfsck_object_put(env, parent);
 
-       rc = lfsck_time_dump(m, ns->ln_time_last_complete,
-                            "time_since_last_completed");
-       if (rc < 0)
-               goto out;
+                                       GOTO(out, rc);
+                               }
 
-       rc = lfsck_time_dump(m, ns->ln_time_latest_start,
-                            "time_since_latest_start");
-       if (rc < 0)
-               goto out;
+                               if (rc > 0)
+                                       repaired = true;
 
-       rc = lfsck_time_dump(m, ns->ln_time_last_checkpoint,
-                            "time_since_last_checkpoint");
-       if (rc < 0)
-               goto out;
-
-       rc = lfsck_pos_dump(m, &ns->ln_pos_latest_start,
-                           "latest_start_position");
-       if (rc < 0)
-               goto out;
+                               /* Add the missing name entry to the parent. */
+                               rc = lfsck_namespace_insert_normal(env, com,
+                                               parent, child, cname->ln_name);
+                               if (unlikely(rc == -EEXIST))
+                                       /* Unfortunately, someone reused the
+                                        * name under the parent by race. So we
+                                        * have to remove the linkEA entry from
+                                        * current child object. It means that
+                                        * the LFSCK cannot recover the system
+                                        * totally back to its original status,
+                                        * but it is necessary to make the
+                                        * current system to be consistent. */
+                                       rc = lfsck_namespace_shrink_linkea(env,
+                                                       com, child, &ldata,
+                                                       cname, pfid, true);
+                               else
+                                       linkea_next_entry(&ldata);
+                       }
 
-       rc = lfsck_pos_dump(m, &ns->ln_pos_last_checkpoint,
-                           "last_checkpoint_position");
-       if (rc < 0)
-               goto out;
+                       lfsck_object_put(env, parent);
+                       if (rc < 0)
+                               GOTO(out, rc);
 
-       rc = lfsck_pos_dump(m, &ns->ln_pos_first_inconsistent,
-                           "first_failure_position");
-       if (rc < 0)
-               goto out;
+                       if (rc > 0)
+                               repaired = true;
 
-       if (ns->ln_status == LS_SCANNING_PHASE1) {
-               struct lfsck_position pos;
-               const struct dt_it_ops *iops;
-               cfs_duration_t duration = cfs_time_current() -
-                                         lfsck->li_time_last_checkpoint;
-               __u64 checked = ns->ln_items_checked + com->lc_new_checked;
-               __u64 speed = checked;
-               __u64 new_checked = com->lc_new_checked * HZ;
-               __u32 rtime = ns->ln_run_time_phase1 +
-                             cfs_duration_sec(duration + HALF_SEC);
+                       continue;
+               }
 
-               if (duration != 0)
-                       do_div(new_checked, duration);
-               if (rtime != 0)
-                       do_div(speed, rtime);
-               lfsck_namespace_dump_statistics(m, ns, checked,
-                                               ns->ln_objs_checked_phase2,
-                                               rtime, ns->ln_run_time_phase2);
+               /* The linkEA entry with bad parent will be removed. */
+               if (unlikely(!dt_try_as_dir(env, parent))) {
+                       lfsck_object_put(env, parent);
+                       rc = lfsck_namespace_shrink_linkea(env, com, child,
+                                               &ldata, cname, pfid, true);
+                       if (rc < 0)
+                               GOTO(out, rc);
 
-               seq_printf(m, "average_speed_phase1: "LPU64" items/sec\n"
-                             "average_speed_phase2: N/A\n"
-                             "real_time_speed_phase1: "LPU64" items/sec\n"
-                             "real_time_speed_phase2: N/A\n",
-                             speed,
-                             new_checked);
+                       if (rc > 0)
+                               repaired = true;
 
-               LASSERT(lfsck->li_di_oit != NULL);
+                       continue;
+               }
 
-               iops = &lfsck->li_obj_oit->do_index_ops->dio_it;
+               rc = dt_lookup(env, parent, (struct dt_rec *)cfid,
+                              (const struct dt_key *)cname->ln_name,
+                              BYPASS_CAPA);
+               if (rc != 0 && rc != -ENOENT) {
+                       lfsck_object_put(env, parent);
 
-               /* The low layer otable-based iteration position may NOT
-                * exactly match the namespace-based directory traversal
-                * cookie. Generally, it is not a serious issue. But the
-                * caller should NOT make assumption on that. */
-               pos.lp_oit_cookie = iops->store(env, lfsck->li_di_oit);
-               if (!lfsck->li_current_oit_processed)
-                       pos.lp_oit_cookie--;
+                       GOTO(out, rc);
+               }
 
-               spin_lock(&lfsck->li_lock);
-               if (lfsck->li_di_dir != NULL) {
-                       pos.lp_dir_cookie = lfsck->li_cookie_dir;
-                       if (pos.lp_dir_cookie >= MDS_DIR_END_OFF) {
-                               fid_zero(&pos.lp_dir_parent);
-                               pos.lp_dir_cookie = 0;
+               if (rc == 0) {
+                       if (lu_fid_eq(cfid, lfsck_dto2fid(child))) {
+                               /* It is the most common case that we
+                                * find the name entry corresponding
+                                * to the linkEA entry. */
+                               lfsck_object_put(env, parent);
+                               linkea_next_entry(&ldata);
                        } else {
-                               pos.lp_dir_parent =
-                                       *lfsck_dto2fid(lfsck->li_obj_dir);
-                       }
-               } else {
-                       fid_zero(&pos.lp_dir_parent);
-                       pos.lp_dir_cookie = 0;
-               }
-               spin_unlock(&lfsck->li_lock);
-               lfsck_pos_dump(m, &pos, "current_position");
-       } else if (ns->ln_status == LS_SCANNING_PHASE2) {
-               cfs_duration_t duration = cfs_time_current() -
-                                         lfsck->li_time_last_checkpoint;
-               __u64 checked = ns->ln_objs_checked_phase2 +
-                               com->lc_new_checked;
-               __u64 speed1 = ns->ln_items_checked;
-               __u64 speed2 = checked;
-               __u64 new_checked = com->lc_new_checked * HZ;
-               __u32 rtime = ns->ln_run_time_phase2 +
-                             cfs_duration_sec(duration + HALF_SEC);
+                               /* The name entry references another
+                                * MDT-object that may be created by
+                                * the LFSCK for repairing dangling
+                                * name entry. Try to replace it. */
+                               rc = lfsck_namespace_replace_cond(env, com,
+                                               parent, child, cfid, cname);
+                               lfsck_object_put(env, parent);
+                               if (rc < 0)
+                                       GOTO(out, rc);
 
-               if (duration != 0)
-                       do_div(new_checked, duration);
-               if (ns->ln_run_time_phase1 != 0)
-                       do_div(speed1, ns->ln_run_time_phase1);
-               if (rtime != 0)
-                       do_div(speed2, rtime);
-               lfsck_namespace_dump_statistics(m, ns, ns->ln_items_checked,
-                                               checked,
-                                               ns->ln_run_time_phase1, rtime);
+                               if (rc > 0) {
+                                       repaired = true;
+                                       linkea_next_entry(&ldata);
+                               } else {
+                                       rc = lfsck_namespace_shrink_linkea(env,
+                                                       com, child, &ldata,
+                                                       cname, pfid, true);
+                                       if (rc < 0)
+                                               GOTO(out, rc);
 
-               seq_printf(m, "average_speed_phase1: "LPU64" items/sec\n"
-                             "average_speed_phase2: "LPU64" objs/sec\n"
-                             "real_time_speed_phase1: N/A\n"
-                             "real_time_speed_phase2: "LPU64" objs/sec\n"
-                             "current_position: "DFID"\n",
-                             speed1,
-                             speed2,
-                             new_checked,
-                             PFID(&ns->ln_fid_latest_scanned_phase2));
-       } else {
-               __u64 speed1 = ns->ln_items_checked;
-               __u64 speed2 = ns->ln_objs_checked_phase2;
+                                       if (rc > 0)
+                                               repaired = true;
+                               }
+                       }
 
-               if (ns->ln_run_time_phase1 != 0)
-                       do_div(speed1, ns->ln_run_time_phase1);
-               if (ns->ln_run_time_phase2 != 0)
-                       do_div(speed2, ns->ln_run_time_phase2);
-               lfsck_namespace_dump_statistics(m, ns, ns->ln_items_checked,
-                                               ns->ln_objs_checked_phase2,
-                                               ns->ln_run_time_phase1,
-                                               ns->ln_run_time_phase2);
+                       continue;
+               }
 
-               seq_printf(m, "average_speed_phase1: "LPU64" items/sec\n"
-                             "average_speed_phase2: "LPU64" objs/sec\n"
-                             "real_time_speed_phase1: N/A\n"
-                             "real_time_speed_phase2: N/A\n"
-                             "current_position: N/A\n",
-                             speed1,
-                             speed2);
-       }
-out:
-       up_read(&com->lc_sem);
-       return 0;
-}
+               rc = dt_attr_get(env, child, la, BYPASS_CAPA);
+               if (rc != 0)
+                       GOTO(out, rc);
 
-static int lfsck_namespace_double_scan(const struct lu_env *env,
-                                      struct lfsck_component *com)
-{
-       struct lfsck_namespace *ns = com->lc_file_ram;
+               /* If there is no name entry in the parent dir and the object
+                * link count is less than the linkea entries count, then the
+                * linkea entry should be removed. */
+               if (ldata.ld_leh->leh_reccount > la->la_nlink) {
+                       rc = lfsck_namespace_shrink_linkea_cond(env, com,
+                                       parent, child, &ldata, cname, pfid);
+                       lfsck_object_put(env, parent);
+                       if (rc < 0)
+                               GOTO(out, rc);
 
-       return lfsck_double_scan_generic(env, com, ns->ln_status);
-}
+                       if (rc > 0)
+                               repaired = true;
 
-static void lfsck_namespace_data_release(const struct lu_env *env,
-                                        struct lfsck_component *com)
-{
-       struct lfsck_assistant_data     *lad    = com->lc_data;
-       struct lfsck_tgt_descs          *ltds   = &com->lc_lfsck->li_mdt_descs;
-       struct lfsck_tgt_desc           *ltd;
-       struct lfsck_tgt_desc           *next;
+                       continue;
+               }
 
-       LASSERT(lad != NULL);
-       LASSERT(thread_is_init(&lad->lad_thread) ||
-               thread_is_stopped(&lad->lad_thread));
-       LASSERT(list_empty(&lad->lad_req_list));
+               /* If the LFSCK is marked as LF_INCOMPLETE, then means some
+                * MDT has ever tried to verify some remote MDT-object that
+                * resides on this MDT, but this MDT failed to respond such
+                * request. So means there may be some remote name entry on
+                * other MDT that references this object with another name,
+                * so we cannot know whether this linkEA is valid or not.
+                * So keep it there and maybe resolved when next LFSCK run. */
+               if (ns->ln_flags & LF_INCOMPLETE) {
+                       lfsck_object_put(env, parent);
 
-       com->lc_data = NULL;
+                       GOTO(out, rc = 0);
+               }
 
-       spin_lock(&ltds->ltd_lock);
-       list_for_each_entry_safe(ltd, next, &lad->lad_mdt_phase1_list,
-                                ltd_namespace_phase_list) {
-               list_del_init(&ltd->ltd_namespace_phase_list);
-       }
-       list_for_each_entry_safe(ltd, next, &lad->lad_mdt_phase2_list,
-                                ltd_namespace_phase_list) {
-               list_del_init(&ltd->ltd_namespace_phase_list);
-       }
-       list_for_each_entry_safe(ltd, next, &lad->lad_mdt_list,
-                                ltd_namespace_list) {
-               list_del_init(&ltd->ltd_namespace_list);
-       }
-       spin_unlock(&ltds->ltd_lock);
+               rc = lfsck_namespace_check_name(env, parent, child, cname);
+               if (rc == -ENOENT)
+                       goto lost_parent;
 
-       CFS_FREE_BITMAP(lad->lad_bitmap);
+               if (rc < 0) {
+                       lfsck_object_put(env, parent);
 
-       OBD_FREE_PTR(lad);
-}
+                       GOTO(out, rc);
+               }
 
-static int lfsck_namespace_in_notify(const struct lu_env *env,
-                                    struct lfsck_component *com,
-                                    struct lfsck_request *lr)
-{
-       struct lfsck_instance           *lfsck = com->lc_lfsck;
-       struct lfsck_namespace          *ns    = com->lc_file_ram;
-       struct lfsck_assistant_data     *lad   = com->lc_data;
-       struct lfsck_tgt_descs          *ltds  = &lfsck->li_mdt_descs;
-       struct lfsck_tgt_desc           *ltd;
-       bool                             fail  = false;
-       ENTRY;
+               /* It is an invalid name entry, drop it. */
+               if (unlikely(rc > 0)) {
+                       lfsck_object_put(env, parent);
+                       rc = lfsck_namespace_shrink_linkea(env, com, child,
+                                               &ldata, cname, pfid, true);
+                       if (rc < 0)
+                               GOTO(out, rc);
 
-       if (lr->lr_event != LE_PHASE1_DONE &&
-           lr->lr_event != LE_PHASE2_DONE &&
-           lr->lr_event != LE_PEER_EXIT)
-               RETURN(-EINVAL);
+                       if (rc > 0)
+                               repaired = true;
 
-       CDEBUG(D_LFSCK, "%s: namespace LFSCK handles notify %u from MDT %x, "
-              "status %d\n", lfsck_lfsck2name(lfsck), lr->lr_event,
-              lr->lr_index, lr->lr_status);
+                       continue;
+               }
 
-       spin_lock(&ltds->ltd_lock);
-       ltd = LTD_TGT(ltds, lr->lr_index);
-       if (ltd == NULL) {
-               spin_unlock(&ltds->ltd_lock);
+               /* Add the missing name entry back to the namespace. */
+               rc = lfsck_namespace_insert_normal(env, com, parent, child,
+                                                  cname->ln_name);
+               if (unlikely(rc == -ESTALE))
+                       /* It may happen when the remote object has been
+                        * removed, but the local MDT is not aware of that. */
+                       goto lost_parent;
+
+               if (unlikely(rc == -EEXIST))
+                       /* Unfortunately, someone reused the name under the
+                        * parent by race. So we have to remove the linkEA
+                        * entry from current child object. It means that the
+                        * LFSCK cannot recover the system totally back to
+                        * its original status, but it is necessary to make
+                        * the current system to be consistent.
+                        *
+                        * It also may be because of the LFSCK found some
+                        * internal status of create operation. Under such
+                        * case, nothing to be done. */
+                       rc = lfsck_namespace_shrink_linkea_cond(env, com,
+                                       parent, child, &ldata, cname, pfid);
+               else
+                       linkea_next_entry(&ldata);
 
-               RETURN(-ENXIO);
+               lfsck_object_put(env, parent);
+               if (rc < 0)
+                       GOTO(out, rc);
+
+               if (rc > 0)
+                       repaired = true;
        }
 
-       list_del_init(&ltd->ltd_namespace_phase_list);
-       switch (lr->lr_event) {
-       case LE_PHASE1_DONE:
-               if (lr->lr_status <= 0) {
-                       ltd->ltd_namespace_done = 1;
-                       list_del_init(&ltd->ltd_namespace_list);
-                       CDEBUG(D_LFSCK, "%s: MDT %x failed/stopped at "
-                              "phase1 for namespace LFSCK: rc = %d.\n",
-                              lfsck_lfsck2name(lfsck),
-                              ltd->ltd_index, lr->lr_status);
-                       ns->ln_flags |= LF_INCOMPLETE;
-                       fail = true;
-                       break;
+       GOTO(out, rc = 0);
+
+out:
+       if (rc < 0 && rc != -ENODATA)
+               return rc;
+
+       if (rc == 0) {
+               LASSERT(ldata.ld_leh != NULL);
+
+               count = ldata.ld_leh->leh_reccount;
+       }
+
+       if (count == 0) {
+               /* If the LFSCK is marked as LF_INCOMPLETE, then means some
+                * MDT has ever tried to verify some remote MDT-object that
+                * resides on this MDT, but this MDT failed to respond such
+                * request. So means there may be some remote name entry on
+                * other MDT that references this object with another name,
+                * so we cannot know whether this linkEA is valid or not.
+                * So keep it there and maybe resolved when next LFSCK run. */
+               if (!(ns->ln_flags & LF_INCOMPLETE)) {
+                       /* If the child becomes orphan, then insert it into
+                        * the global .lustre/lost+found/MDTxxxx directory. */
+                       rc = lfsck_namespace_insert_orphan(env, com, child,
+                                                          "", "O", &count);
+                       if (rc < 0)
+                               return rc;
+
+                       if (rc > 0) {
+                               ns->ln_mul_ref_repaired++;
+                               repaired = true;
+                       }
                }
+       } else {
+               rc = dt_attr_get(env, child, la, BYPASS_CAPA);
+               if (rc != 0)
+                       return rc;
 
-               if (list_empty(&ltd->ltd_namespace_list))
-                       list_add_tail(&ltd->ltd_namespace_list,
-                                     &lad->lad_mdt_list);
-               list_add_tail(&ltd->ltd_namespace_phase_list,
-                             &lad->lad_mdt_phase2_list);
-               break;
-       case LE_PHASE2_DONE:
-               ltd->ltd_namespace_done = 1;
-               list_del_init(&ltd->ltd_namespace_list);
-               break;
-       case LE_PEER_EXIT:
-               fail = true;
-               ltd->ltd_namespace_done = 1;
-               list_del_init(&ltd->ltd_namespace_list);
-               if (!(lfsck->li_bookmark_ram.lb_param & LPF_FAILOUT)) {
-                       CDEBUG(D_LFSCK,
-                              "%s: the peer MDT %x exit namespace LFSCK\n",
-                              lfsck_lfsck2name(lfsck), ltd->ltd_index);
-                       ns->ln_flags |= LF_INCOMPLETE;
+               if (la->la_nlink != 0 && la->la_nlink != count) {
+                       rc = lfsck_namespace_repair_nlink(env, com, child, la);
+                       if (rc > 0) {
+                               ns->ln_objs_nlink_repaired++;
+                               rc = 0;
+                       }
                }
-               break;
-       default:
-               break;
        }
-       spin_unlock(&ltds->ltd_lock);
 
-       if (fail && lfsck->li_bookmark_ram.lb_param & LPF_FAILOUT) {
-               struct lfsck_stop *stop = &lfsck_env_info(env)->lti_stop;
+       if (repaired) {
+               if (la->la_nlink > 1)
+                       ns->ln_mul_linked_repaired++;
 
-               memset(stop, 0, sizeof(*stop));
-               stop->ls_status = lr->lr_status;
-               stop->ls_flags = lr->lr_param & ~LPF_BROADCAST;
-               lfsck_stop(env, lfsck->li_bottom, stop);
-       } else if (lfsck_phase2_next_ready(lad)) {
-               wake_up_all(&lad->lad_thread.t_ctl_waitq);
+               if (rc == 0)
+                       rc = 1;
        }
 
-       RETURN(0);
+       return rc;
 }
 
-static int lfsck_namespace_query(const struct lu_env *env,
-                                struct lfsck_component *com)
+static void lfsck_namespace_dump_statistics(struct seq_file *m,
+                                           struct lfsck_namespace *ns,
+                                           __u64 checked_phase1,
+                                           __u64 checked_phase2,
+                                           __u32 time_phase1,
+                                           __u32 time_phase2)
 {
-       struct lfsck_namespace *ns = com->lc_file_ram;
+       seq_printf(m, "checked_phase1: "LPU64"\n"
+                     "checked_phase2: "LPU64"\n"
+                     "updated_phase1: "LPU64"\n"
+                     "updated_phase2: "LPU64"\n"
+                     "failed_phase1: "LPU64"\n"
+                     "failed_phase2: "LPU64"\n"
+                     "directories: "LPU64"\n"
+                     "dirent_repaired: "LPU64"\n"
+                     "linkea_repaired: "LPU64"\n"
+                     "nlinks_repaired: "LPU64"\n"
+                     "multiple_linked_checked: "LPU64"\n"
+                     "multiple_linked_repaired: "LPU64"\n"
+                     "unknown_inconsistency: "LPU64"\n"
+                     "unmatched_pairs_repaired: "LPU64"\n"
+                     "dangling_repaired: "LPU64"\n"
+                     "multiple_referenced_repaired: "LPU64"\n"
+                     "bad_file_type_repaired: "LPU64"\n"
+                     "lost_dirent_repaired: "LPU64"\n"
+                     "local_lost_found_scanned: "LPU64"\n"
+                     "local_lost_found_moved: "LPU64"\n"
+                     "local_lost_found_skipped: "LPU64"\n"
+                     "local_lost_found_failed: "LPU64"\n"
+                     "striped_dirs_scanned: "LPU64"\n"
+                     "striped_dirs_repaired: "LPU64"\n"
+                     "striped_dirs_failed: "LPU64"\n"
+                     "striped_dirs_disabled: "LPU64"\n"
+                     "striped_dirs_skipped: "LPU64"\n"
+                     "striped_shards_scanned: "LPU64"\n"
+                     "striped_shards_repaired: "LPU64"\n"
+                     "striped_shards_failed: "LPU64"\n"
+                     "striped_shards_skipped: "LPU64"\n"
+                     "name_hash_repaired: "LPU64"\n"
+                     "success_count: %u\n"
+                     "run_time_phase1: %u seconds\n"
+                     "run_time_phase2: %u seconds\n",
+                     checked_phase1,
+                     checked_phase2,
+                     ns->ln_items_repaired,
+                     ns->ln_objs_repaired_phase2,
+                     ns->ln_items_failed,
+                     ns->ln_objs_failed_phase2,
+                     ns->ln_dirs_checked,
+                     ns->ln_dirent_repaired,
+                     ns->ln_linkea_repaired,
+                     ns->ln_objs_nlink_repaired,
+                     ns->ln_mul_linked_checked,
+                     ns->ln_mul_linked_repaired,
+                     ns->ln_unknown_inconsistency,
+                     ns->ln_unmatched_pairs_repaired,
+                     ns->ln_dangling_repaired,
+                     ns->ln_mul_ref_repaired,
+                     ns->ln_bad_type_repaired,
+                     ns->ln_lost_dirent_repaired,
+                     ns->ln_local_lpf_scanned,
+                     ns->ln_local_lpf_moved,
+                     ns->ln_local_lpf_skipped,
+                     ns->ln_local_lpf_failed,
+                     ns->ln_striped_dirs_scanned,
+                     ns->ln_striped_dirs_repaired,
+                     ns->ln_striped_dirs_failed,
+                     ns->ln_striped_dirs_disabled,
+                     ns->ln_striped_dirs_skipped,
+                     ns->ln_striped_shards_scanned,
+                     ns->ln_striped_shards_repaired,
+                     ns->ln_striped_shards_failed,
+                     ns->ln_striped_shards_skipped,
+                     ns->ln_name_hash_repaired,
+                     ns->ln_success_count,
+                     time_phase1,
+                     time_phase2);
+}
 
-       return ns->ln_status;
+static void lfsck_namespace_release_lmv(const struct lu_env *env,
+                                       struct lfsck_component *com)
+{
+       struct lfsck_instance           *lfsck  = com->lc_lfsck;
+       struct lfsck_namespace          *ns     = com->lc_file_ram;
+
+       while (!list_empty(&lfsck->li_list_lmv)) {
+               struct lfsck_lmv_unit   *llu;
+               struct lfsck_lmv        *llmv;
+
+               llu = list_entry(lfsck->li_list_lmv.next,
+                                struct lfsck_lmv_unit, llu_link);
+               llmv = &llu->llu_lmv;
+
+               LASSERTF(atomic_read(&llmv->ll_ref) == 1,
+                        "still in using: %u\n",
+                        atomic_read(&llmv->ll_ref));
+
+               ns->ln_striped_dirs_skipped++;
+               lfsck_lmv_put(env, llmv);
+       }
 }
 
-static struct lfsck_operations lfsck_namespace_ops = {
-       .lfsck_reset            = lfsck_namespace_reset,
-       .lfsck_fail             = lfsck_namespace_fail,
-       .lfsck_checkpoint       = lfsck_namespace_checkpoint,
-       .lfsck_prep             = lfsck_namespace_prep,
-       .lfsck_exec_oit         = lfsck_namespace_exec_oit,
-       .lfsck_exec_dir         = lfsck_namespace_exec_dir,
-       .lfsck_post             = lfsck_namespace_post,
-       .lfsck_dump             = lfsck_namespace_dump,
-       .lfsck_double_scan      = lfsck_namespace_double_scan,
-       .lfsck_data_release     = lfsck_namespace_data_release,
-       .lfsck_quit             = lfsck_quit_generic,
-       .lfsck_in_notify        = lfsck_namespace_in_notify,
-       .lfsck_query            = lfsck_namespace_query,
-};
+/* namespace APIs */
 
-/**
- * Repair dangling name entry.
- *
- * For the name entry with dangling reference, we need to repare the
- * inconsistency according to the LFSCK sponsor's requirement:
- *
- * 1) Keep the inconsistency there and report the inconsistency case,
- *    then give the chance to the application to find related issues,
- *    and the users can make the decision about how to handle it with
- *    more human knownledge. (by default)
- *
- * 2) Re-create the missed MDT-object with the FID information.
- *
- * \param[in] env      pointer to the thread context
- * \param[in] com      pointer to the lfsck component
- * \param[in] child    pointer to the object corresponding to the dangling
- *                     name entry
- * \param[in] lnr      pointer to the namespace request that contains the
- *                     name's name, parent object, parent's LMV, and ect.
- *
- * \retval             positive number if no need to repair
- * \retval             zero for repaired successfully
- * \retval             negative error number on failure
- */
-int lfsck_namespace_repair_dangling(const struct lu_env *env,
-                                   struct lfsck_component *com,
-                                   struct dt_object *child,
-                                   struct lfsck_namespace_req *lnr)
+static int lfsck_namespace_reset(const struct lu_env *env,
+                                struct lfsck_component *com, bool init)
 {
-       struct lfsck_thread_info        *info   = lfsck_env_info(env);
-       struct lu_attr                  *la     = &info->lti_la;
-       struct dt_allocation_hint       *hint   = &info->lti_hint;
-       struct dt_object_format         *dof    = &info->lti_dof;
-       struct dt_insert_rec            *rec    = &info->lti_dt_rec;
-       struct dt_object                *parent = lnr->lnr_obj;
-       const struct lu_name            *cname;
-       struct linkea_data               ldata  = { 0 };
-       struct lustre_handle             lh     = { 0 };
-       struct lu_buf                    linkea_buf;
        struct lfsck_instance           *lfsck  = com->lc_lfsck;
-       struct lfsck_bookmark           *bk     = &lfsck->li_bookmark_ram;
-       struct dt_device                *dev    = lfsck_obj2dt_dev(child);
-       struct thandle                  *th     = NULL;
-       int                              rc     = 0;
-       __u16                            type   = lnr->lnr_type;
-       bool                             create;
+       struct lfsck_namespace          *ns     = com->lc_file_ram;
+       struct lfsck_assistant_data     *lad    = com->lc_data;
+       struct dt_object                *root;
+       struct dt_object                *dto;
+       int                              rc;
        ENTRY;
 
-       cname = lfsck_name_get_const(env, lnr->lnr_name, lnr->lnr_namelen);
-       if (bk->lb_param & LPF_CREATE_MDTOBJ)
-               create = true;
-       else
-               create = false;
+       root = dt_locate(env, lfsck->li_bottom, &lfsck->li_local_root_fid);
+       if (IS_ERR(root))
+               GOTO(log, rc = PTR_ERR(root));
 
-       if (!create || bk->lb_param & LPF_DRYRUN)
-               GOTO(log, rc = 0);
+       if (unlikely(!dt_try_as_dir(env, root)))
+               GOTO(put, rc = -ENOTDIR);
+
+       down_write(&com->lc_sem);
+       if (init) {
+               memset(ns, 0, sizeof(*ns));
+       } else {
+               __u32 count = ns->ln_success_count;
+               __u64 last_time = ns->ln_time_last_complete;
+
+               memset(ns, 0, sizeof(*ns));
+               ns->ln_success_count = count;
+               ns->ln_time_last_complete = last_time;
+       }
+       ns->ln_magic = LFSCK_NAMESPACE_MAGIC;
+       ns->ln_status = LS_INIT;
+
+       rc = local_object_unlink(env, lfsck->li_bottom, root,
+                                lfsck_namespace_name);
+       if (rc != 0)
+               GOTO(out, rc);
+
+       lfsck_object_put(env, com->lc_obj);
+       com->lc_obj = NULL;
+       dto = local_index_find_or_create(env, lfsck->li_los, root,
+                                        lfsck_namespace_name,
+                                        S_IFREG | S_IRUGO | S_IWUSR,
+                                        &dt_lfsck_features);
+       if (IS_ERR(dto))
+               GOTO(out, rc = PTR_ERR(dto));
+
+       com->lc_obj = dto;
+       rc = dto->do_ops->do_index_try(env, dto, &dt_lfsck_features);
+       if (rc != 0)
+               GOTO(out, rc);
+
+       lad->lad_incomplete = 0;
+       CFS_RESET_BITMAP(lad->lad_bitmap);
+
+       rc = lfsck_namespace_store(env, com, true);
+
+       GOTO(out, rc);
+
+out:
+       up_write(&com->lc_sem);
+
+put:
+       lu_object_put(env, &root->do_lu);
+log:
+       CDEBUG(D_LFSCK, "%s: namespace LFSCK reset: rc = %d\n",
+              lfsck_lfsck2name(lfsck), rc);
+       return rc;
+}
+
+static void
+lfsck_namespace_fail(const struct lu_env *env, struct lfsck_component *com,
+                    bool new_checked)
+{
+       struct lfsck_namespace *ns = com->lc_file_ram;
+
+       down_write(&com->lc_sem);
+       if (new_checked)
+               com->lc_new_checked++;
+       lfsck_namespace_record_failure(env, com->lc_lfsck, ns);
+       up_write(&com->lc_sem);
+}
+
+static void lfsck_namespace_close_dir(const struct lu_env *env,
+                                     struct lfsck_component *com)
+{
+       struct lfsck_namespace          *ns     = com->lc_file_ram;
+       struct lfsck_assistant_data     *lad    = com->lc_data;
+       struct lfsck_instance           *lfsck  = com->lc_lfsck;
+       struct lfsck_lmv                *llmv   = lfsck->li_lmv;
+       struct lfsck_namespace_req      *lnr;
+       __u32                            size   =
+                               sizeof(*lnr) + LFSCK_TMPBUF_LEN;
+       bool                             wakeup = false;
+       ENTRY;
+
+       if (llmv == NULL)
+               RETURN_EXIT;
+
+       OBD_ALLOC(lnr, size);
+       if (lnr == NULL) {
+               ns->ln_striped_dirs_skipped++;
+
+               RETURN_EXIT;
+       }
+
+       /* Generate a dummy request to indicate that all shards' name entry
+        * in this striped directory has been scanned for the first time. */
+       INIT_LIST_HEAD(&lnr->lnr_lar.lar_list);
+       lnr->lnr_obj = lfsck_object_get(lfsck->li_obj_dir);
+       lnr->lnr_lmv = lfsck_lmv_get(llmv);
+       lnr->lnr_fid = *lfsck_dto2fid(lfsck->li_obj_dir);
+       lnr->lnr_oit_cookie = lfsck->li_pos_current.lp_oit_cookie;
+       lnr->lnr_dir_cookie = MDS_DIR_END_OFF;
+       lnr->lnr_size = size;
+
+       spin_lock(&lad->lad_lock);
+       if (lad->lad_assistant_status < 0) {
+               spin_unlock(&lad->lad_lock);
+               lfsck_namespace_assistant_req_fini(env, &lnr->lnr_lar);
+               ns->ln_striped_dirs_skipped++;
+
+               RETURN_EXIT;
+       }
+
+       list_add_tail(&lnr->lnr_lar.lar_list, &lad->lad_req_list);
+       if (lad->lad_prefetched == 0)
+               wakeup = true;
+
+       lad->lad_prefetched++;
+       spin_unlock(&lad->lad_lock);
+       if (wakeup)
+               wake_up_all(&lad->lad_thread.t_ctl_waitq);
+
+       EXIT;
+}
+
+static int lfsck_namespace_open_dir(const struct lu_env *env,
+                                   struct lfsck_component *com)
+{
+       struct lfsck_instance   *lfsck  = com->lc_lfsck;
+       struct lfsck_namespace  *ns     = com->lc_file_ram;
+       struct lfsck_lmv        *llmv   = lfsck->li_lmv;
+       int                      rc     = 0;
+       ENTRY;
+
+       if (llmv == NULL)
+               RETURN(0);
+
+       if (llmv->ll_lmv_master) {
+               struct lmv_mds_md_v1 *lmv = &llmv->ll_lmv;
+
+               if (lmv->lmv_master_mdt_index !=
+                   lfsck_dev_idx(lfsck->li_bottom)) {
+                       lmv->lmv_master_mdt_index =
+                               lfsck_dev_idx(lfsck->li_bottom);
+                       ns->ln_flags |= LF_INCONSISTENT;
+                       llmv->ll_lmv_updated = 1;
+               }
+       } else {
+               rc = lfsck_namespace_verify_stripe_slave(env, com,
+                                       lfsck->li_obj_dir, llmv);
+       }
+
+       RETURN(rc > 0 ? 0 : rc);
+}
+
+static int lfsck_namespace_checkpoint(const struct lu_env *env,
+                                     struct lfsck_component *com, bool init)
+{
+       struct lfsck_instance   *lfsck = com->lc_lfsck;
+       struct lfsck_namespace  *ns    = com->lc_file_ram;
+       int                      rc;
+
+       if (!init) {
+               rc = lfsck_checkpoint_generic(env, com);
+               if (rc != 0)
+                       goto log;
+       }
+
+       down_write(&com->lc_sem);
+       if (init) {
+               ns->ln_pos_latest_start = lfsck->li_pos_checkpoint;
+       } else {
+               ns->ln_pos_last_checkpoint = lfsck->li_pos_checkpoint;
+               ns->ln_run_time_phase1 += cfs_duration_sec(cfs_time_current() +
+                               HALF_SEC - lfsck->li_time_last_checkpoint);
+               ns->ln_time_last_checkpoint = cfs_time_current_sec();
+               ns->ln_items_checked += com->lc_new_checked;
+               com->lc_new_checked = 0;
+       }
+
+       rc = lfsck_namespace_store(env, com, false);
+       up_write(&com->lc_sem);
+
+log:
+       CDEBUG(D_LFSCK, "%s: namespace LFSCK checkpoint at the pos ["LPU64
+              ", "DFID", "LPX64"]: rc = %d\n", lfsck_lfsck2name(lfsck),
+              lfsck->li_pos_current.lp_oit_cookie,
+              PFID(&lfsck->li_pos_current.lp_dir_parent),
+              lfsck->li_pos_current.lp_dir_cookie, rc);
+
+       return rc > 0 ? 0 : rc;
+}
+
+static int lfsck_namespace_prep(const struct lu_env *env,
+                               struct lfsck_component *com,
+                               struct lfsck_start_param *lsp)
+{
+       struct lfsck_instance   *lfsck  = com->lc_lfsck;
+       struct lfsck_namespace  *ns     = com->lc_file_ram;
+       struct lfsck_position   *pos    = &com->lc_pos_start;
+       int                      rc;
+
+       rc = lfsck_namespace_load_bitmap(env, com);
+       if (rc != 0 || ns->ln_status == LS_COMPLETED) {
+               rc = lfsck_namespace_reset(env, com, false);
+               if (rc == 0)
+                       rc = lfsck_set_param(env, lfsck, lsp->lsp_start, true);
+
+               if (rc != 0) {
+                       CDEBUG(D_LFSCK, "%s: namespace LFSCK prep failed: "
+                              "rc = %d\n", lfsck_lfsck2name(lfsck), rc);
+
+                       return rc;
+               }
+       }
+
+       down_write(&com->lc_sem);
+       ns->ln_time_latest_start = cfs_time_current_sec();
+       spin_lock(&lfsck->li_lock);
+
+       if (ns->ln_flags & LF_SCANNED_ONCE) {
+               if (!lfsck->li_drop_dryrun ||
+                   lfsck_pos_is_zero(&ns->ln_pos_first_inconsistent)) {
+                       ns->ln_status = LS_SCANNING_PHASE2;
+                       list_move_tail(&com->lc_link,
+                                      &lfsck->li_list_double_scan);
+                       if (!list_empty(&com->lc_link_dir))
+                               list_del_init(&com->lc_link_dir);
+                       lfsck_pos_set_zero(pos);
+               } else {
+                       ns->ln_status = LS_SCANNING_PHASE1;
+                       ns->ln_run_time_phase1 = 0;
+                       ns->ln_run_time_phase2 = 0;
+                       ns->ln_items_checked = 0;
+                       ns->ln_items_repaired = 0;
+                       ns->ln_items_failed = 0;
+                       ns->ln_dirs_checked = 0;
+                       ns->ln_objs_checked_phase2 = 0;
+                       ns->ln_objs_repaired_phase2 = 0;
+                       ns->ln_objs_failed_phase2 = 0;
+                       ns->ln_objs_nlink_repaired = 0;
+                       ns->ln_dirent_repaired = 0;
+                       ns->ln_linkea_repaired = 0;
+                       ns->ln_mul_linked_checked = 0;
+                       ns->ln_mul_linked_repaired = 0;
+                       ns->ln_unknown_inconsistency = 0;
+                       ns->ln_unmatched_pairs_repaired = 0;
+                       ns->ln_dangling_repaired = 0;
+                       ns->ln_mul_ref_repaired = 0;
+                       ns->ln_bad_type_repaired = 0;
+                       ns->ln_lost_dirent_repaired = 0;
+                       ns->ln_striped_dirs_scanned = 0;
+                       ns->ln_striped_dirs_repaired = 0;
+                       ns->ln_striped_dirs_failed = 0;
+                       ns->ln_striped_dirs_disabled = 0;
+                       ns->ln_striped_dirs_skipped = 0;
+                       ns->ln_striped_shards_scanned = 0;
+                       ns->ln_striped_shards_repaired = 0;
+                       ns->ln_striped_shards_failed = 0;
+                       ns->ln_striped_shards_skipped = 0;
+                       ns->ln_name_hash_repaired = 0;
+                       fid_zero(&ns->ln_fid_latest_scanned_phase2);
+                       if (list_empty(&com->lc_link_dir))
+                               list_add_tail(&com->lc_link_dir,
+                                             &lfsck->li_list_dir);
+                       *pos = ns->ln_pos_first_inconsistent;
+               }
+       } else {
+               ns->ln_status = LS_SCANNING_PHASE1;
+               if (list_empty(&com->lc_link_dir))
+                       list_add_tail(&com->lc_link_dir,
+                                     &lfsck->li_list_dir);
+               if (!lfsck->li_drop_dryrun ||
+                   lfsck_pos_is_zero(&ns->ln_pos_first_inconsistent)) {
+                       *pos = ns->ln_pos_last_checkpoint;
+                       pos->lp_oit_cookie++;
+               } else {
+                       *pos = ns->ln_pos_first_inconsistent;
+               }
+       }
+
+       spin_unlock(&lfsck->li_lock);
+       up_write(&com->lc_sem);
+
+       rc = lfsck_start_assistant(env, com, lsp);
+
+       CDEBUG(D_LFSCK, "%s: namespace LFSCK prep done, start pos ["LPU64", "
+              DFID", "LPX64"]: rc = %d\n",
+              lfsck_lfsck2name(lfsck), pos->lp_oit_cookie,
+              PFID(&pos->lp_dir_parent), pos->lp_dir_cookie, rc);
+
+       return rc;
+}
+
+static int lfsck_namespace_exec_oit(const struct lu_env *env,
+                                   struct lfsck_component *com,
+                                   struct dt_object *obj)
+{
+       struct lfsck_thread_info *info  = lfsck_env_info(env);
+       struct lfsck_namespace   *ns    = com->lc_file_ram;
+       struct lfsck_instance    *lfsck = com->lc_lfsck;
+       const struct lu_fid      *fid   = lfsck_dto2fid(obj);
+       struct lu_attr           *la    = &info->lti_la;
+       struct lu_fid            *pfid  = &info->lti_fid2;
+       struct lu_name           *cname = &info->lti_name;
+       struct lu_seq_range      *range = &info->lti_range;
+       struct dt_device         *dev   = lfsck->li_bottom;
+       struct seq_server_site   *ss    =
+                               lu_site2seq(dev->dd_lu_dev.ld_site);
+       struct linkea_data        ldata = { 0 };
+       __u32                     idx   = lfsck_dev_idx(dev);
+       int                       rc;
+       ENTRY;
+
+       rc = lfsck_links_read(env, obj, &ldata);
+       if (rc == -ENOENT)
+               GOTO(out, rc = 0);
+
+       /* -EINVAL means crashed linkEA, should be verified. */
+       if (rc == -EINVAL) {
+               rc = lfsck_namespace_trace_update(env, com, fid,
+                                                 LNTF_CHECK_LINKEA, true);
+               if (rc == 0) {
+                       struct lustre_handle lh = { 0 };
+
+                       rc = lfsck_ibits_lock(env, lfsck, obj, &lh,
+                                             MDS_INODELOCK_UPDATE |
+                                             MDS_INODELOCK_XATTR, LCK_EX);
+                       if (rc == 0) {
+                               rc = lfsck_namespace_links_remove(env, com,
+                                                                 obj);
+                               lfsck_ibits_unlock(&lh, LCK_EX);
+                       }
+               }
+
+               GOTO(out, rc = (rc == -ENOENT ? 0 : rc));
+       }
+
+       /* zero-linkEA object may be orphan, but it also maybe because
+        * of upgrading. Currently, we cannot record it for double scan.
+        * Because it may cause the LFSCK trace file to be too large. */
+       if (rc == -ENODATA) {
+               if (S_ISDIR(lfsck_object_type(obj)))
+                       GOTO(out, rc = 0);
+
+               rc = dt_attr_get(env, obj, la, BYPASS_CAPA);
+               if (rc != 0)
+                       GOTO(out, rc);
+
+               /* "la_ctime" == 1 means that it has ever been removed from
+                * backend /lost+found directory but not been added back to
+                * the normal namespace yet. */
+               if (la->la_nlink > 1 || unlikely(la->la_ctime == 1))
+                       rc = lfsck_namespace_trace_update(env, com, fid,
+                                               LNTF_CHECK_LINKEA, true);
+
+               GOTO(out, rc);
+       }
+
+       if (rc != 0)
+               GOTO(out, rc);
+
+       /* Record multiple-linked object. */
+       if (ldata.ld_leh->leh_reccount > 1) {
+               rc = lfsck_namespace_trace_update(env, com, fid,
+                                                 LNTF_CHECK_LINKEA, true);
+
+               GOTO(out, rc);
+       }
+
+       linkea_first_entry(&ldata);
+       linkea_entry_unpack(ldata.ld_lee, &ldata.ld_reclen, cname, pfid);
+       if (!fid_is_sane(pfid)) {
+               rc = lfsck_namespace_trace_update(env, com, fid,
+                                                 LNTF_CHECK_PARENT, true);
+       } else {
+               fld_range_set_mdt(range);
+               rc = fld_local_lookup(env, ss->ss_server_fld,
+                                     fid_seq(pfid), range);
+               if ((rc == -ENOENT) ||
+                   (rc == 0 && range->lsr_index != idx)) {
+                       rc = lfsck_namespace_trace_update(env, com, fid,
+                                               LNTF_CHECK_LINKEA, true);
+               } else {
+                       if (S_ISDIR(lfsck_object_type(obj)))
+                               GOTO(out, rc = 0);
+
+                       rc = dt_attr_get(env, obj, la, BYPASS_CAPA);
+                       if (rc != 0)
+                               GOTO(out, rc);
+
+                       /* "la_ctime" == 1 means that it has ever been
+                        * removed from backend /lost+found directory but
+                        * not been added back to the normal namespace yet. */
+                       if (la->la_nlink > 1 || unlikely(la->la_ctime == 1))
+                               rc = lfsck_namespace_trace_update(env, com,
+                                               fid, LNTF_CHECK_LINKEA, true);
+               }
+       }
+
+       GOTO(out, rc);
+
+out:
+       down_write(&com->lc_sem);
+       com->lc_new_checked++;
+       if (S_ISDIR(lfsck_object_type(obj)))
+               ns->ln_dirs_checked++;
+       if (rc != 0)
+               lfsck_namespace_record_failure(env, com->lc_lfsck, ns);
+       up_write(&com->lc_sem);
+
+       return rc;
+}
+
+static int lfsck_namespace_exec_dir(const struct lu_env *env,
+                                   struct lfsck_component *com,
+                                   struct lu_dirent *ent, __u16 type)
+{
+       struct lfsck_assistant_data     *lad     = com->lc_data;
+       struct lfsck_instance           *lfsck   = com->lc_lfsck;
+       struct lfsck_namespace_req      *lnr;
+       struct lfsck_bookmark           *bk      = &lfsck->li_bookmark_ram;
+       struct ptlrpc_thread            *mthread = &lfsck->li_thread;
+       struct ptlrpc_thread            *athread = &lad->lad_thread;
+       struct l_wait_info               lwi     = { 0 };
+       bool                             wakeup  = false;
+
+       l_wait_event(mthread->t_ctl_waitq,
+                    bk->lb_async_windows == 0 ||
+                    lad->lad_prefetched < bk->lb_async_windows ||
+                    !thread_is_running(mthread) ||
+                    thread_is_stopped(athread),
+                    &lwi);
+
+       if (unlikely(!thread_is_running(mthread)) ||
+                    thread_is_stopped(athread))
+               return 0;
+
+       if (unlikely(lfsck_is_dead_obj(lfsck->li_obj_dir)))
+               return 0;
+
+       lnr = lfsck_namespace_assistant_req_init(com->lc_lfsck, ent, type);
+       if (IS_ERR(lnr)) {
+               struct lfsck_namespace *ns = com->lc_file_ram;
+
+               lfsck_namespace_record_failure(env, com->lc_lfsck, ns);
+               return PTR_ERR(lnr);
+       }
+
+       spin_lock(&lad->lad_lock);
+       if (lad->lad_assistant_status < 0) {
+               spin_unlock(&lad->lad_lock);
+               lfsck_namespace_assistant_req_fini(env, &lnr->lnr_lar);
+               return lad->lad_assistant_status;
+       }
+
+       list_add_tail(&lnr->lnr_lar.lar_list, &lad->lad_req_list);
+       if (lad->lad_prefetched == 0)
+               wakeup = true;
+
+       lad->lad_prefetched++;
+       spin_unlock(&lad->lad_lock);
+       if (wakeup)
+               wake_up_all(&lad->lad_thread.t_ctl_waitq);
+
+       down_write(&com->lc_sem);
+       com->lc_new_checked++;
+       up_write(&com->lc_sem);
+
+       return 0;
+}
+
+static int lfsck_namespace_post(const struct lu_env *env,
+                               struct lfsck_component *com,
+                               int result, bool init)
+{
+       struct lfsck_instance   *lfsck = com->lc_lfsck;
+       struct lfsck_namespace  *ns    = com->lc_file_ram;
+       int                      rc;
+       ENTRY;
+
+       lfsck_post_generic(env, com, &result);
+
+       down_write(&com->lc_sem);
+       lfsck_namespace_release_lmv(env, com);
+
+       spin_lock(&lfsck->li_lock);
+       if (!init)
+               ns->ln_pos_last_checkpoint = lfsck->li_pos_checkpoint;
+       if (result > 0) {
+               ns->ln_status = LS_SCANNING_PHASE2;
+               ns->ln_flags |= LF_SCANNED_ONCE;
+               ns->ln_flags &= ~LF_UPGRADE;
+               list_del_init(&com->lc_link_dir);
+               list_move_tail(&com->lc_link, &lfsck->li_list_double_scan);
+       } else if (result == 0) {
+               if (lfsck->li_status != 0)
+                       ns->ln_status = lfsck->li_status;
+               else
+                       ns->ln_status = LS_STOPPED;
+               if (ns->ln_status != LS_PAUSED) {
+                       list_del_init(&com->lc_link_dir);
+                       list_move_tail(&com->lc_link, &lfsck->li_list_idle);
+               }
+       } else {
+               ns->ln_status = LS_FAILED;
+               list_del_init(&com->lc_link_dir);
+               list_move_tail(&com->lc_link, &lfsck->li_list_idle);
+       }
+       spin_unlock(&lfsck->li_lock);
+
+       if (!init) {
+               ns->ln_run_time_phase1 += cfs_duration_sec(cfs_time_current() +
+                               HALF_SEC - lfsck->li_time_last_checkpoint);
+               ns->ln_time_last_checkpoint = cfs_time_current_sec();
+               ns->ln_items_checked += com->lc_new_checked;
+               com->lc_new_checked = 0;
+       }
+
+       rc = lfsck_namespace_store(env, com, false);
+       up_write(&com->lc_sem);
+
+       CDEBUG(D_LFSCK, "%s: namespace LFSCK post done: rc = %d\n",
+              lfsck_lfsck2name(lfsck), rc);
+
+       RETURN(rc);
+}
+
+static int
+lfsck_namespace_dump(const struct lu_env *env, struct lfsck_component *com,
+                    struct seq_file *m)
+{
+       struct lfsck_instance   *lfsck = com->lc_lfsck;
+       struct lfsck_bookmark   *bk    = &lfsck->li_bookmark_ram;
+       struct lfsck_namespace  *ns    = com->lc_file_ram;
+       int                      rc;
+
+       down_read(&com->lc_sem);
+       seq_printf(m, "name: lfsck_namespace\n"
+                  "magic: %#x\n"
+                  "version: %d\n"
+                  "status: %s\n",
+                  ns->ln_magic,
+                  bk->lb_version,
+                  lfsck_status2names(ns->ln_status));
+
+       rc = lfsck_bits_dump(m, ns->ln_flags, lfsck_flags_names, "flags");
+       if (rc < 0)
+               goto out;
+
+       rc = lfsck_bits_dump(m, bk->lb_param, lfsck_param_names, "param");
+       if (rc < 0)
+               goto out;
+
+       rc = lfsck_time_dump(m, ns->ln_time_last_complete,
+                            "time_since_last_completed");
+       if (rc < 0)
+               goto out;
+
+       rc = lfsck_time_dump(m, ns->ln_time_latest_start,
+                            "time_since_latest_start");
+       if (rc < 0)
+               goto out;
+
+       rc = lfsck_time_dump(m, ns->ln_time_last_checkpoint,
+                            "time_since_last_checkpoint");
+       if (rc < 0)
+               goto out;
+
+       rc = lfsck_pos_dump(m, &ns->ln_pos_latest_start,
+                           "latest_start_position");
+       if (rc < 0)
+               goto out;
+
+       rc = lfsck_pos_dump(m, &ns->ln_pos_last_checkpoint,
+                           "last_checkpoint_position");
+       if (rc < 0)
+               goto out;
+
+       rc = lfsck_pos_dump(m, &ns->ln_pos_first_inconsistent,
+                           "first_failure_position");
+       if (rc < 0)
+               goto out;
+
+       if (ns->ln_status == LS_SCANNING_PHASE1) {
+               struct lfsck_position pos;
+               const struct dt_it_ops *iops;
+               cfs_duration_t duration = cfs_time_current() -
+                                         lfsck->li_time_last_checkpoint;
+               __u64 checked = ns->ln_items_checked + com->lc_new_checked;
+               __u64 speed = checked;
+               __u64 new_checked = com->lc_new_checked *
+                                   msecs_to_jiffies(MSEC_PER_SEC);
+               __u32 rtime = ns->ln_run_time_phase1 +
+                             cfs_duration_sec(duration + HALF_SEC);
+
+               if (duration != 0)
+                       do_div(new_checked, duration);
+               if (rtime != 0)
+                       do_div(speed, rtime);
+               lfsck_namespace_dump_statistics(m, ns, checked,
+                                               ns->ln_objs_checked_phase2,
+                                               rtime, ns->ln_run_time_phase2);
+
+               seq_printf(m, "average_speed_phase1: "LPU64" items/sec\n"
+                             "average_speed_phase2: N/A\n"
+                             "real_time_speed_phase1: "LPU64" items/sec\n"
+                             "real_time_speed_phase2: N/A\n",
+                             speed,
+                             new_checked);
+
+               LASSERT(lfsck->li_di_oit != NULL);
+
+               iops = &lfsck->li_obj_oit->do_index_ops->dio_it;
+
+               /* The low layer otable-based iteration position may NOT
+                * exactly match the namespace-based directory traversal
+                * cookie. Generally, it is not a serious issue. But the
+                * caller should NOT make assumption on that. */
+               pos.lp_oit_cookie = iops->store(env, lfsck->li_di_oit);
+               if (!lfsck->li_current_oit_processed)
+                       pos.lp_oit_cookie--;
+
+               spin_lock(&lfsck->li_lock);
+               if (lfsck->li_di_dir != NULL) {
+                       pos.lp_dir_cookie = lfsck->li_cookie_dir;
+                       if (pos.lp_dir_cookie >= MDS_DIR_END_OFF) {
+                               fid_zero(&pos.lp_dir_parent);
+                               pos.lp_dir_cookie = 0;
+                       } else {
+                               pos.lp_dir_parent =
+                                       *lfsck_dto2fid(lfsck->li_obj_dir);
+                       }
+               } else {
+                       fid_zero(&pos.lp_dir_parent);
+                       pos.lp_dir_cookie = 0;
+               }
+               spin_unlock(&lfsck->li_lock);
+               lfsck_pos_dump(m, &pos, "current_position");
+       } else if (ns->ln_status == LS_SCANNING_PHASE2) {
+               cfs_duration_t duration = cfs_time_current() -
+                                         lfsck->li_time_last_checkpoint;
+               __u64 checked = ns->ln_objs_checked_phase2 +
+                               com->lc_new_checked;
+               __u64 speed1 = ns->ln_items_checked;
+               __u64 speed2 = checked;
+               __u64 new_checked = com->lc_new_checked *
+                                   msecs_to_jiffies(MSEC_PER_SEC);
+               __u32 rtime = ns->ln_run_time_phase2 +
+                             cfs_duration_sec(duration + HALF_SEC);
+
+               if (duration != 0)
+                       do_div(new_checked, duration);
+               if (ns->ln_run_time_phase1 != 0)
+                       do_div(speed1, ns->ln_run_time_phase1);
+               if (rtime != 0)
+                       do_div(speed2, rtime);
+               lfsck_namespace_dump_statistics(m, ns, ns->ln_items_checked,
+                                               checked,
+                                               ns->ln_run_time_phase1, rtime);
+
+               seq_printf(m, "average_speed_phase1: "LPU64" items/sec\n"
+                             "average_speed_phase2: "LPU64" objs/sec\n"
+                             "real_time_speed_phase1: N/A\n"
+                             "real_time_speed_phase2: "LPU64" objs/sec\n"
+                             "current_position: "DFID"\n",
+                             speed1,
+                             speed2,
+                             new_checked,
+                             PFID(&ns->ln_fid_latest_scanned_phase2));
+       } else {
+               __u64 speed1 = ns->ln_items_checked;
+               __u64 speed2 = ns->ln_objs_checked_phase2;
+
+               if (ns->ln_run_time_phase1 != 0)
+                       do_div(speed1, ns->ln_run_time_phase1);
+               if (ns->ln_run_time_phase2 != 0)
+                       do_div(speed2, ns->ln_run_time_phase2);
+               lfsck_namespace_dump_statistics(m, ns, ns->ln_items_checked,
+                                               ns->ln_objs_checked_phase2,
+                                               ns->ln_run_time_phase1,
+                                               ns->ln_run_time_phase2);
+
+               seq_printf(m, "average_speed_phase1: "LPU64" items/sec\n"
+                             "average_speed_phase2: "LPU64" objs/sec\n"
+                             "real_time_speed_phase1: N/A\n"
+                             "real_time_speed_phase2: N/A\n"
+                             "current_position: N/A\n",
+                             speed1,
+                             speed2);
+       }
+out:
+       up_read(&com->lc_sem);
+       return 0;
+}
+
+static int lfsck_namespace_double_scan(const struct lu_env *env,
+                                      struct lfsck_component *com)
+{
+       struct lfsck_namespace          *ns     = com->lc_file_ram;
+       struct lfsck_assistant_data     *lad    = com->lc_data;
+       struct lfsck_tgt_descs          *ltds   = &com->lc_lfsck->li_mdt_descs;
+       struct lfsck_tgt_desc           *ltd;
+       struct lfsck_tgt_desc           *next;
+       int                              rc;
+
+       rc = lfsck_double_scan_generic(env, com, ns->ln_status);
+       if (thread_is_stopped(&lad->lad_thread)) {
+               LASSERT(list_empty(&lad->lad_req_list));
+               LASSERT(list_empty(&lad->lad_mdt_phase1_list));
+
+               spin_lock(&ltds->ltd_lock);
+               list_for_each_entry_safe(ltd, next, &lad->lad_mdt_phase2_list,
+                                        ltd_namespace_phase_list) {
+                       list_del_init(&ltd->ltd_namespace_phase_list);
+               }
+               spin_unlock(&ltds->ltd_lock);
+       }
+
+       return rc;
+}
+
+static void lfsck_namespace_data_release(const struct lu_env *env,
+                                        struct lfsck_component *com)
+{
+       struct lfsck_assistant_data     *lad    = com->lc_data;
+       struct lfsck_tgt_descs          *ltds   = &com->lc_lfsck->li_mdt_descs;
+       struct lfsck_tgt_desc           *ltd;
+       struct lfsck_tgt_desc           *next;
+
+       LASSERT(lad != NULL);
+       LASSERT(thread_is_init(&lad->lad_thread) ||
+               thread_is_stopped(&lad->lad_thread));
+       LASSERT(list_empty(&lad->lad_req_list));
+
+       com->lc_data = NULL;
+       lfsck_namespace_release_lmv(env, com);
+
+       spin_lock(&ltds->ltd_lock);
+       list_for_each_entry_safe(ltd, next, &lad->lad_mdt_phase1_list,
+                                ltd_namespace_phase_list) {
+               list_del_init(&ltd->ltd_namespace_phase_list);
+       }
+       list_for_each_entry_safe(ltd, next, &lad->lad_mdt_phase2_list,
+                                ltd_namespace_phase_list) {
+               list_del_init(&ltd->ltd_namespace_phase_list);
+       }
+       list_for_each_entry_safe(ltd, next, &lad->lad_mdt_list,
+                                ltd_namespace_list) {
+               list_del_init(&ltd->ltd_namespace_list);
+       }
+       spin_unlock(&ltds->ltd_lock);
+
+       if (likely(lad->lad_bitmap != NULL))
+               CFS_FREE_BITMAP(lad->lad_bitmap);
+
+       OBD_FREE_PTR(lad);
+}
+
+static void lfsck_namespace_quit(const struct lu_env *env,
+                                struct lfsck_component *com)
+{
+       struct lfsck_assistant_data     *lad    = com->lc_data;
+       struct lfsck_tgt_descs          *ltds   = &com->lc_lfsck->li_mdt_descs;
+       struct lfsck_tgt_desc           *ltd;
+       struct lfsck_tgt_desc           *next;
+
+       LASSERT(lad != NULL);
+
+       lfsck_quit_generic(env, com);
+
+       LASSERT(thread_is_init(&lad->lad_thread) ||
+               thread_is_stopped(&lad->lad_thread));
+       LASSERT(list_empty(&lad->lad_req_list));
+
+       lfsck_namespace_release_lmv(env, com);
+
+       spin_lock(&ltds->ltd_lock);
+       list_for_each_entry_safe(ltd, next, &lad->lad_mdt_phase1_list,
+                                ltd_namespace_phase_list) {
+               list_del_init(&ltd->ltd_namespace_phase_list);
+       }
+       list_for_each_entry_safe(ltd, next, &lad->lad_mdt_phase2_list,
+                                ltd_namespace_phase_list) {
+               list_del_init(&ltd->ltd_namespace_phase_list);
+       }
+       spin_unlock(&ltds->ltd_lock);
+}
+
+static int lfsck_namespace_in_notify(const struct lu_env *env,
+                                    struct lfsck_component *com,
+                                    struct lfsck_request *lr,
+                                    struct thandle *th)
+{
+       struct lfsck_instance           *lfsck = com->lc_lfsck;
+       struct lfsck_namespace          *ns    = com->lc_file_ram;
+       struct lfsck_assistant_data     *lad   = com->lc_data;
+       struct lfsck_tgt_descs          *ltds  = &lfsck->li_mdt_descs;
+       struct lfsck_tgt_desc           *ltd;
+       int                              rc;
+       bool                             fail  = false;
+       ENTRY;
+
+       switch (lr->lr_event) {
+       case LE_CREATE_ORPHAN: {
+               struct dt_object *orphan = NULL;
+               struct lmv_mds_md_v1 *lmv;
+
+               CDEBUG(D_LFSCK, "%s: namespace LFSCK handling notify from "
+                      "MDT %x to create orphan"DFID" with type %o\n",
+                      lfsck_lfsck2name(lfsck), lr->lr_index,
+                      PFID(&lr->lr_fid), lr->lr_type);
+
+               orphan = lfsck_object_find(env, lfsck, &lr->lr_fid);
+               if (IS_ERR(orphan))
+                       GOTO(out_create, rc = PTR_ERR(orphan));
+
+               if (dt_object_exists(orphan))
+                       GOTO(out_create, rc = -EEXIST);
+
+               if (lr->lr_stripe_count > 0) {
+                       lmv = &lfsck_env_info(env)->lti_lmv;
+                       memset(lmv, 0, sizeof(*lmv));
+                       lmv->lmv_hash_type = lr->lr_hash_type;
+                       lmv->lmv_stripe_count = lr->lr_stripe_count;
+                       lmv->lmv_layout_version = lr->lr_layout_version;
+                       memcpy(lmv->lmv_pool_name, lr->lr_pool_name,
+                              sizeof(lmv->lmv_pool_name));
+               } else {
+                       lmv = NULL;
+               }
+
+               rc = lfsck_namespace_create_orphan_local(env, com, orphan,
+                                                        lr->lr_type, lmv);
+
+               GOTO(out_create, rc = (rc == 1) ? 0 : rc);
+
+out_create:
+               CDEBUG(D_LFSCK, "%s: namespace LFSCK handled notify from "
+                      "MDT %x to create orphan"DFID" with type %o: rc = %d\n",
+                      lfsck_lfsck2name(lfsck), lr->lr_index,
+                      PFID(&lr->lr_fid), lr->lr_type, rc);
+
+               if (orphan != NULL && !IS_ERR(orphan))
+                       lfsck_object_put(env, orphan);
+
+               return rc;
+       }
+       case LE_SKIP_NLINK_DECLARE: {
+               struct dt_object        *obj   = com->lc_obj;
+               struct lu_fid           *key   = &lfsck_env_info(env)->lti_fid3;
+               __u8                     flags = 0;
+
+               LASSERT(th != NULL);
+
+               rc = dt_declare_delete(env, obj,
+                                      (const struct dt_key *)key, th);
+               if (rc == 0)
+                       rc = dt_declare_insert(env, obj,
+                                              (const struct dt_rec *)&flags,
+                                              (const struct dt_key *)key, th);
+
+               RETURN(rc);
+       }
+       case LE_SKIP_NLINK: {
+               struct dt_object        *obj   = com->lc_obj;
+               struct lu_fid           *key   = &lfsck_env_info(env)->lti_fid3;
+               __u8                     flags = 0;
+               bool                     exist = false;
+               ENTRY;
+
+               LASSERT(th != NULL);
+
+               fid_cpu_to_be(key, &lr->lr_fid);
+               rc = dt_lookup(env, obj, (struct dt_rec *)&flags,
+                              (const struct dt_key *)key, BYPASS_CAPA);
+               if (rc == 0) {
+                       if (flags & LNTF_SKIP_NLINK)
+                               RETURN(0);
+
+                       exist = true;
+               } else if (rc != -ENOENT) {
+                       GOTO(log, rc);
+               }
+
+               flags |= LNTF_SKIP_NLINK;
+               if (exist) {
+                       rc = dt_delete(env, obj, (const struct dt_key *)key,
+                                      th, BYPASS_CAPA);
+                       if (rc != 0)
+                               GOTO(log, rc);
+               }
+
+               rc = dt_insert(env, obj, (const struct dt_rec *)&flags,
+                              (const struct dt_key *)key, th, BYPASS_CAPA, 1);
+
+               GOTO(log, rc);
+
+log:
+               CDEBUG(D_LFSCK, "%s: RPC service thread mark the "DFID
+                      " to be skipped for namespace double scan: rc = %d\n",
+                      lfsck_lfsck2name(com->lc_lfsck), PFID(&lr->lr_fid), rc);
+
+               if (rc != 0)
+                       /* If we cannot record this object in the LFSCK tracing,
+                        * we have to mark the LFSC as LF_INCOMPLETE, then the
+                        * LFSCK will skip nlink attribute verification for
+                        * all objects. */
+                       ns->ln_flags |= LF_INCOMPLETE;
+
+               return 0;
+       }
+       case LE_SET_LMV_MASTER: {
+               struct dt_object        *obj;
+
+               obj = lfsck_object_find_by_dev(env, lfsck->li_bottom,
+                                              &lr->lr_fid);
+               if (IS_ERR(obj))
+                       RETURN(PTR_ERR(obj));
+
+               rc = lfsck_namespace_notify_lmv_master_local(env, com, obj);
+               lfsck_object_put(env, obj);
+
+               RETURN(rc > 0 ? 0 : rc);
+       }
+       case LE_SET_LMV_SLAVE: {
+               if (!(lr->lr_flags & LEF_RECHECK_NAME_HASH))
+                       ns->ln_striped_shards_repaired++;
+
+               rc = lfsck_namespace_trace_update(env, com, &lr->lr_fid,
+                                                 LNTF_RECHECK_NAME_HASH, true);
+
+               RETURN(rc > 0 ? 0 : rc);
+       }
+       case LE_PHASE1_DONE:
+       case LE_PHASE2_DONE:
+       case LE_PEER_EXIT:
+               break;
+       default:
+               RETURN(-EINVAL);
+       }
+
+       CDEBUG(D_LFSCK, "%s: namespace LFSCK handles notify %u from MDT %x, "
+              "status %d, flags %x\n", lfsck_lfsck2name(lfsck), lr->lr_event,
+              lr->lr_index, lr->lr_status, lr->lr_flags2);
+
+       spin_lock(&ltds->ltd_lock);
+       ltd = LTD_TGT(ltds, lr->lr_index);
+       if (ltd == NULL) {
+               spin_unlock(&ltds->ltd_lock);
+
+               RETURN(-ENXIO);
+       }
+
+       list_del_init(&ltd->ltd_namespace_phase_list);
+       switch (lr->lr_event) {
+       case LE_PHASE1_DONE:
+               if (lr->lr_status <= 0) {
+                       ltd->ltd_namespace_done = 1;
+                       list_del_init(&ltd->ltd_namespace_list);
+                       CDEBUG(D_LFSCK, "%s: MDT %x failed/stopped at "
+                              "phase1 for namespace LFSCK: rc = %d.\n",
+                              lfsck_lfsck2name(lfsck),
+                              ltd->ltd_index, lr->lr_status);
+                       ns->ln_flags |= LF_INCOMPLETE;
+                       fail = true;
+                       break;
+               }
+
+               if (lr->lr_flags2 & LF_INCOMPLETE)
+                       ns->ln_flags |= LF_INCOMPLETE;
+
+               if (list_empty(&ltd->ltd_namespace_list))
+                       list_add_tail(&ltd->ltd_namespace_list,
+                                     &lad->lad_mdt_list);
+               list_add_tail(&ltd->ltd_namespace_phase_list,
+                             &lad->lad_mdt_phase2_list);
+               break;
+       case LE_PHASE2_DONE:
+               ltd->ltd_namespace_done = 1;
+               list_del_init(&ltd->ltd_namespace_list);
+               break;
+       case LE_PEER_EXIT:
+               fail = true;
+               ltd->ltd_namespace_done = 1;
+               list_del_init(&ltd->ltd_namespace_list);
+               if (!(lfsck->li_bookmark_ram.lb_param & LPF_FAILOUT)) {
+                       CDEBUG(D_LFSCK,
+                              "%s: the peer MDT %x exit namespace LFSCK\n",
+                              lfsck_lfsck2name(lfsck), ltd->ltd_index);
+                       ns->ln_flags |= LF_INCOMPLETE;
+               }
+               break;
+       default:
+               break;
+       }
+       spin_unlock(&ltds->ltd_lock);
+
+       if (fail && lfsck->li_bookmark_ram.lb_param & LPF_FAILOUT) {
+               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;
+               lfsck_stop(env, lfsck->li_bottom, stop);
+       } else if (lfsck_phase2_next_ready(lad)) {
+               wake_up_all(&lad->lad_thread.t_ctl_waitq);
+       }
+
+       RETURN(0);
+}
+
+static int lfsck_namespace_query(const struct lu_env *env,
+                                struct lfsck_component *com)
+{
+       struct lfsck_namespace *ns = com->lc_file_ram;
+
+       return ns->ln_status;
+}
+
+static struct lfsck_operations lfsck_namespace_ops = {
+       .lfsck_reset            = lfsck_namespace_reset,
+       .lfsck_fail             = lfsck_namespace_fail,
+       .lfsck_close_dir        = lfsck_namespace_close_dir,
+       .lfsck_open_dir         = lfsck_namespace_open_dir,
+       .lfsck_checkpoint       = lfsck_namespace_checkpoint,
+       .lfsck_prep             = lfsck_namespace_prep,
+       .lfsck_exec_oit         = lfsck_namespace_exec_oit,
+       .lfsck_exec_dir         = lfsck_namespace_exec_dir,
+       .lfsck_post             = lfsck_namespace_post,
+       .lfsck_dump             = lfsck_namespace_dump,
+       .lfsck_double_scan      = lfsck_namespace_double_scan,
+       .lfsck_data_release     = lfsck_namespace_data_release,
+       .lfsck_quit             = lfsck_namespace_quit,
+       .lfsck_in_notify        = lfsck_namespace_in_notify,
+       .lfsck_query            = lfsck_namespace_query,
+};
+
+/**
+ * Repair dangling name entry.
+ *
+ * For the name entry with dangling reference, we need to repare the
+ * inconsistency according to the LFSCK sponsor's requirement:
+ *
+ * 1) Keep the inconsistency there and report the inconsistency case,
+ *    then give the chance to the application to find related issues,
+ *    and the users can make the decision about how to handle it with
+ *    more human knownledge. (by default)
+ *
+ * 2) Re-create the missing MDT-object with the FID information.
+ *
+ * \param[in] env      pointer to the thread context
+ * \param[in] com      pointer to the lfsck component
+ * \param[in] child    pointer to the object corresponding to the dangling
+ *                     name entry
+ * \param[in] lnr      pointer to the namespace request that contains the
+ *                     name's name, parent object, parent's LMV, and ect.
+ *
+ * \retval             positive number if no need to repair
+ * \retval             zero for repaired successfully
+ * \retval             negative error number on failure
+ */
+int lfsck_namespace_repair_dangling(const struct lu_env *env,
+                                   struct lfsck_component *com,
+                                   struct dt_object *child,
+                                   struct lfsck_namespace_req *lnr)
+{
+       struct lfsck_thread_info        *info   = lfsck_env_info(env);
+       struct lu_attr                  *la     = &info->lti_la;
+       struct dt_allocation_hint       *hint   = &info->lti_hint;
+       struct dt_object_format         *dof    = &info->lti_dof;
+       struct dt_insert_rec            *rec    = &info->lti_dt_rec;
+       struct lmv_mds_md_v1            *lmv2   = &info->lti_lmv2;
+       struct dt_object                *parent = lnr->lnr_obj;
+       const struct lu_name            *cname;
+       struct linkea_data               ldata  = { 0 };
+       struct lustre_handle             lh     = { 0 };
+       struct lu_buf                    linkea_buf;
+       struct lu_buf                    lmv_buf;
+       struct lfsck_instance           *lfsck  = com->lc_lfsck;
+       struct lfsck_bookmark           *bk     = &lfsck->li_bookmark_ram;
+       struct dt_device                *dev    = lfsck_obj2dt_dev(child);
+       struct thandle                  *th     = NULL;
+       int                              rc     = 0;
+       __u16                            type   = lnr->lnr_type;
+       bool                             create;
+       ENTRY;
+
+       cname = lfsck_name_get_const(env, lnr->lnr_name, lnr->lnr_namelen);
+       if (bk->lb_param & LPF_CREATE_MDTOBJ)
+               create = true;
+       else
+               create = false;
+
+       if (!create || bk->lb_param & LPF_DRYRUN)
+               GOTO(log, rc = 0);
+
+       rc = linkea_data_new(&ldata, &info->lti_linkea_buf2);
+       if (rc != 0)
+               GOTO(log, rc);
+
+       rc = linkea_add_buf(&ldata, cname, lfsck_dto2fid(parent));
+       if (rc != 0)
+               GOTO(log, rc);
+
+       rc = lfsck_ibits_lock(env, lfsck, parent, &lh,
+                             MDS_INODELOCK_UPDATE, LCK_EX);
+       if (rc != 0)
+               GOTO(log, rc);
+
+       rc = lfsck_namespace_check_exist(env, parent, child, lnr->lnr_name);
+       if (rc != 0)
+               GOTO(log, rc);
+
+       th = dt_trans_create(env, dev);
+       if (IS_ERR(th))
+               GOTO(log, rc = PTR_ERR(th));
+
+       /* Set the ctime as zero, then others can know it is created for
+        * repairing dangling name entry by LFSCK. And if the LFSCK made
+        * wrong decision and the real MDT-object has been found later,
+        * then the LFSCK has chance to fix the incosistency properly. */
+       memset(la, 0, sizeof(*la));
+       la->la_mode = (type & S_IFMT) | 0600;
+       la->la_valid = LA_TYPE | LA_MODE | LA_UID | LA_GID |
+                       LA_ATIME | LA_MTIME | LA_CTIME;
+
+       child->do_ops->do_ah_init(env, hint, parent, child,
+                                 la->la_mode & S_IFMT);
+
+       memset(dof, 0, sizeof(*dof));
+       dof->dof_type = dt_mode_to_dft(type);
+       /* If the target is a regular file, then the LFSCK will only create
+        * the MDT-object without stripes (dof->dof_reg.striped = 0). related
+        * OST-objects will be created when write open. */
+
+       /* 1a. create child. */
+       rc = dt_declare_create(env, child, la, hint, dof, th);
+       if (rc != 0)
+               GOTO(stop, rc);
+
+       if (S_ISDIR(type)) {
+               if (unlikely(!dt_try_as_dir(env, child)))
+                       GOTO(stop, rc = -ENOTDIR);
+
+               /* 2a. insert dot into child dir */
+               rec->rec_type = S_IFDIR;
+               rec->rec_fid = lfsck_dto2fid(child);
+               rc = dt_declare_insert(env, child,
+                                      (const struct dt_rec *)rec,
+                                      (const struct dt_key *)dot, th);
+               if (rc != 0)
+                       GOTO(stop, rc);
+
+               /* 3a. insert dotdot into child dir */
+               rec->rec_fid = lfsck_dto2fid(parent);
+               rc = dt_declare_insert(env, child,
+                                      (const struct dt_rec *)rec,
+                                      (const struct dt_key *)dotdot, th);
+               if (rc != 0)
+                       GOTO(stop, rc);
+
+               /* 4a. increase child nlink */
+               rc = dt_declare_ref_add(env, child, th);
+               if (rc != 0)
+                       GOTO(stop, rc);
+
+               /* 5a. generate slave LMV EA. */
+               if (lnr->lnr_lmv != NULL && lnr->lnr_lmv->ll_lmv_master) {
+                       int idx;
+
+                       idx = lfsck_shard_name_to_index(env,
+                                       lnr->lnr_name, lnr->lnr_namelen,
+                                       type, lfsck_dto2fid(child));
+                       if (unlikely(idx < 0))
+                               GOTO(stop, rc = idx);
+
+                       *lmv2 = lnr->lnr_lmv->ll_lmv;
+                       lmv2->lmv_magic = LMV_MAGIC_STRIPE;
+                       lmv2->lmv_master_mdt_index = idx;
+
+                       lfsck_lmv_header_cpu_to_le(lmv2, lmv2);
+                       lfsck_buf_init(&lmv_buf, lmv2, sizeof(*lmv2));
+                       rc = dt_declare_xattr_set(env, child, &lmv_buf,
+                                                 XATTR_NAME_LMV, 0, th);
+                       if (rc != 0)
+                               GOTO(stop, rc);
+               }
+       }
+
+       /* 6a. insert linkEA for child */
+       lfsck_buf_init(&linkea_buf, ldata.ld_buf->lb_buf,
+                      ldata.ld_leh->leh_len);
+       rc = dt_declare_xattr_set(env, child, &linkea_buf,
+                                 XATTR_NAME_LINK, 0, th);
+       if (rc != 0)
+               GOTO(stop, rc);
+
+       rc = dt_trans_start(env, dev, th);
+       if (rc != 0)
+               GOTO(stop, rc = (rc == -EEXIST ? 1 : rc));
+
+       dt_write_lock(env, child, 0);
+       /* 1b. create child */
+       rc = dt_create(env, child, la, hint, dof, th);
+       if (rc != 0)
+               GOTO(unlock, rc = (rc == -EEXIST ? 1 : rc));
+
+       if (S_ISDIR(type)) {
+               if (unlikely(!dt_try_as_dir(env, child)))
+                       GOTO(unlock, rc = -ENOTDIR);
+
+               /* 2b. insert dot into child dir */
+               rec->rec_type = S_IFDIR;
+               rec->rec_fid = lfsck_dto2fid(child);
+               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);
+
+               /* 3b. insert dotdot into child dir */
+               rec->rec_fid = lfsck_dto2fid(parent);
+               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);
+
+               /* 4b. increase child nlink */
+               rc = dt_ref_add(env, child, th);
+               if (rc != 0)
+                       GOTO(unlock, rc);
+
+               /* 5b. generate slave LMV EA. */
+               if (lnr->lnr_lmv != NULL && lnr->lnr_lmv->ll_lmv_master) {
+                       rc = dt_xattr_set(env, child, &lmv_buf, XATTR_NAME_LMV,
+                                         0, th, BYPASS_CAPA);
+                       if (rc != 0)
+                               GOTO(unlock, rc);
+               }
+       }
+
+       /* 6b. insert linkEA for child. */
+       rc = dt_xattr_set(env, child, &linkea_buf,
+                         XATTR_NAME_LINK, 0, th, BYPASS_CAPA);
+
+       GOTO(unlock, rc);
+
+unlock:
+       dt_write_unlock(env, child);
+
+stop:
+       dt_trans_stop(env, dev, th);
+
+log:
+       lfsck_ibits_unlock(&lh, LCK_EX);
+       CDEBUG(D_LFSCK, "%s: namespace LFSCK assistant found dangling "
+              "reference for: parent "DFID", child "DFID", type %u, "
+              "name %s. %s: rc = %d\n", lfsck_lfsck2name(lfsck),
+              PFID(lfsck_dto2fid(parent)), PFID(lfsck_dto2fid(child)),
+              type, cname->ln_name,
+              create ? "Create the lost OST-object as required" :
+                       "Keep the MDT-object there by default", rc);
+
+       if (rc <= 0) {
+               struct lfsck_namespace *ns = com->lc_file_ram;
+
+               ns->ln_flags |= LF_INCONSISTENT;
+       }
+
+       return rc;
+}
+
+static int lfsck_namespace_assistant_handler_p1(const struct lu_env *env,
+                                               struct lfsck_component *com,
+                                               struct lfsck_assistant_req *lar)
+{
+       struct lfsck_thread_info   *info     = lfsck_env_info(env);
+       struct lu_attr             *la       = &info->lti_la;
+       struct lfsck_instance      *lfsck    = com->lc_lfsck;
+       struct lfsck_bookmark      *bk       = &lfsck->li_bookmark_ram;
+       struct lfsck_namespace     *ns       = com->lc_file_ram;
+       struct linkea_data          ldata    = { 0 };
+       const struct lu_name       *cname;
+       struct thandle             *handle   = NULL;
+       struct lfsck_namespace_req *lnr      =
+                       container_of0(lar, struct lfsck_namespace_req, lnr_lar);
+       struct dt_object           *dir      = lnr->lnr_obj;
+       struct dt_object           *obj      = NULL;
+       const struct lu_fid        *pfid     = lfsck_dto2fid(dir);
+       struct dt_device           *dev      = NULL;
+       struct lustre_handle        lh       = { 0 };
+       bool                        repaired = false;
+       bool                        dtlocked = false;
+       bool                        remove;
+       bool                        newdata;
+       bool                        log      = false;
+       bool                        bad_hash = false;
+       int                         idx      = 0;
+       int                         count    = 0;
+       int                         rc;
+       enum lfsck_namespace_inconsistency_type type = LNIT_NONE;
+       ENTRY;
+
+       if (lnr->lnr_attr & LUDA_UPGRADE) {
+               ns->ln_flags |= LF_UPGRADE;
+               ns->ln_dirent_repaired++;
+               repaired = true;
+       } else if (lnr->lnr_attr & LUDA_REPAIR) {
+               ns->ln_flags |= LF_INCONSISTENT;
+               ns->ln_dirent_repaired++;
+               repaired = true;
+       }
+
+       if (unlikely(fid_is_zero(&lnr->lnr_fid))) {
+               if (strcmp(lnr->lnr_name, dotdot) != 0)
+                       LBUG();
+               else
+                       rc = lfsck_namespace_trace_update(env, com, pfid,
+                                               LNTF_CHECK_PARENT, true);
+
+               GOTO(out, rc);
+       }
+
+       if (unlikely(lnr->lnr_dir_cookie == MDS_DIR_END_OFF)) {
+               rc = lfsck_namespace_striped_dir_rescan(env, com, lnr);
+
+               RETURN(rc);
+       }
+
+       if (lnr->lnr_name[0] == '.' &&
+           (lnr->lnr_namelen == 1 || fid_seq_is_dot(fid_seq(&lnr->lnr_fid))))
+               GOTO(out, rc = 0);
+
+       if (lnr->lnr_lmv != NULL && lnr->lnr_lmv->ll_lmv_master) {
+               rc = lfsck_namespace_handle_striped_master(env, com, lnr);
+
+               RETURN(rc);
+       }
+
+       idx = lfsck_find_mdt_idx_by_fid(env, lfsck, &lnr->lnr_fid);
+       if (idx < 0)
+               GOTO(out, rc = idx);
+
+       if (idx == lfsck_dev_idx(lfsck->li_bottom)) {
+               if (unlikely(strcmp(lnr->lnr_name, dotdot) == 0))
+                       GOTO(out, rc = 0);
+
+               dev = lfsck->li_next;
+       } else {
+               struct lfsck_tgt_desc *ltd;
+
+               /* Usually, some local filesystem consistency verification
+                * tools can guarantee the local namespace tree consistenct.
+                * So the LFSCK will only verify the remote directory. */
+               if (unlikely(strcmp(lnr->lnr_name, dotdot) == 0)) {
+                       rc = lfsck_namespace_trace_update(env, com, pfid,
+                                               LNTF_CHECK_PARENT, true);
+
+                       GOTO(out, rc);
+               }
+
+               ltd = LTD_TGT(&lfsck->li_mdt_descs, idx);
+               if (unlikely(ltd == NULL)) {
+                       CDEBUG(D_LFSCK, "%s: cannot talk with MDT %x which "
+                              "did not join the namespace LFSCK\n",
+                              lfsck_lfsck2name(lfsck), idx);
+                       lfsck_lad_set_bitmap(env, com, idx);
+
+                       GOTO(out, rc = -ENODEV);
+               }
+
+               dev = ltd->ltd_tgt;
+       }
+
+       obj = lfsck_object_find_by_dev(env, dev, &lnr->lnr_fid);
+       if (IS_ERR(obj))
+               GOTO(out, rc = PTR_ERR(obj));
+
+       cname = lfsck_name_get_const(env, lnr->lnr_name, lnr->lnr_namelen);
+       if (dt_object_exists(obj) == 0) {
+
+dangling:
+               rc = lfsck_namespace_check_exist(env, dir, obj, lnr->lnr_name);
+               if (rc == 0) {
+                       if (!lfsck_is_valid_slave_name_entry(env, lnr->lnr_lmv,
+                                       lnr->lnr_name, lnr->lnr_namelen)) {
+                               type = LNIT_BAD_DIRENT;
+
+                               GOTO(out, rc);
+                       }
+
+                       type = LNIT_DANGLING;
+                       rc = lfsck_namespace_repair_dangling(env, com,
+                                                            obj, lnr);
+                       if (rc == 0)
+                               repaired = true;
+               }
+
+               GOTO(out, rc);
+       }
+
+       if (!(bk->lb_param & LPF_DRYRUN) && repaired) {
+
+again:
+               rc = lfsck_ibits_lock(env, lfsck, obj, &lh,
+                                     MDS_INODELOCK_UPDATE |
+                                     MDS_INODELOCK_XATTR, LCK_EX);
+               if (rc != 0)
+                       GOTO(out, rc);
+
+               handle = dt_trans_create(env, dev);
+               if (IS_ERR(handle))
+                       GOTO(out, rc = PTR_ERR(handle));
+
+               rc = lfsck_declare_namespace_exec_dir(env, obj, handle);
+               if (rc != 0)
+                       GOTO(stop, rc);
+
+               rc = dt_trans_start(env, dev, handle);
+               if (rc != 0)
+                       GOTO(stop, rc);
+
+               dt_write_lock(env, obj, 0);
+               dtlocked = true;
+       }
+
+       rc = lfsck_namespace_check_exist(env, dir, obj, lnr->lnr_name);
+       if (rc != 0)
+               GOTO(stop, rc);
+
+       rc = lfsck_links_read(env, obj, &ldata);
+       if (unlikely(rc == -ENOENT)) {
+               if (handle != NULL) {
+                       dt_write_unlock(env, obj);
+                       dtlocked = false;
+
+                       dt_trans_stop(env, dev, handle);
+                       handle = NULL;
+
+                       lfsck_ibits_unlock(&lh, LCK_EX);
+               }
+
+               /* It may happen when the remote object has been removed,
+                * but the local MDT is not aware of that. */
+               goto dangling;
+       } else if (rc == 0) {
+               count = ldata.ld_leh->leh_reccount;
+               rc = linkea_links_find(&ldata, cname, pfid);
+               if ((rc == 0) &&
+                   (count == 1 || !S_ISDIR(lfsck_object_type(obj)))) {
+                       if ((lfsck_object_type(obj) & S_IFMT) !=
+                           lnr->lnr_type) {
+                               ns->ln_flags |= LF_INCONSISTENT;
+                               type = LNIT_BAD_TYPE;
+                       }
+
+                       goto record;
+               }
+
+               ns->ln_flags |= LF_INCONSISTENT;
+
+               /* If the name entry hash does not match the slave striped
+                * directory, and the name entry does not match also, then
+                * it is quite possible that name entry is corrupted. */
+               if (!lfsck_is_valid_slave_name_entry(env, lnr->lnr_lmv,
+                                       lnr->lnr_name, lnr->lnr_namelen)) {
+                       type = LNIT_BAD_DIRENT;
+
+                       GOTO(stop, rc = 0);
+               }
+
+               /* If the file type stored in the name entry does not match
+                * the file type claimed by the object, and the object does
+                * not recognize the name entry, then it is quite possible
+                * that the name entry is corrupted. */
+               if ((lfsck_object_type(obj) & S_IFMT) != lnr->lnr_type) {
+                       type = LNIT_BAD_DIRENT;
+
+                       GOTO(stop, rc = 0);
+               }
+
+               /* For sub-dir object, we cannot make sure whether the sub-dir
+                * back references the parent via ".." name entry correctly or
+                * not in the LFSCK first-stage scanning. It may be that the
+                * (remote) sub-dir ".." name entry has no parent FID after
+                * file-level backup/restore and its linkEA may be wrong.
+                * So under such case, we should replace the linkEA according
+                * to current name entry. But this needs to be done during the
+                * LFSCK second-stage scanning. The LFSCK will record the name
+                * entry for further possible using. */
+               remove = false;
+               newdata = false;
+               goto nodata;
+       } else if (unlikely(rc == -EINVAL)) {
+               if ((lfsck_object_type(obj) & S_IFMT) != lnr->lnr_type)
+                       type = LNIT_BAD_TYPE;
+
+               count = 1;
+               ns->ln_flags |= LF_INCONSISTENT;
+               /* The magic crashed, we are not sure whether there are more
+                * corrupt data in the linkea, so remove all linkea entries. */
+               remove = true;
+               newdata = true;
+               goto nodata;
+       } else if (rc == -ENODATA) {
+               if ((lfsck_object_type(obj) & S_IFMT) != lnr->lnr_type)
+                       type = LNIT_BAD_TYPE;
+
+               count = 1;
+               ns->ln_flags |= LF_UPGRADE;
+               remove = false;
+               newdata = true;
 
-       rc = linkea_data_new(&ldata, &info->lti_linkea_buf2);
-       if (rc != 0)
-               GOTO(log, rc);
+nodata:
+               if (bk->lb_param & LPF_DRYRUN) {
+                       ns->ln_linkea_repaired++;
+                       repaired = true;
+                       log = true;
+                       goto record;
+               }
 
-       rc = linkea_add_buf(&ldata, cname, lfsck_dto2fid(parent));
-       if (rc != 0)
-               GOTO(log, rc);
+               if (!lustre_handle_is_used(&lh))
+                       goto again;
 
-       rc = lfsck_ibits_lock(env, lfsck, parent, &lh,
-                             MDS_INODELOCK_UPDATE, LCK_EX);
-       if (rc != 0)
-               GOTO(log, rc);
+               if (remove) {
+                       LASSERT(newdata);
 
-       rc = lfsck_namespace_check_exist(env, parent, child, lnr->lnr_name);
-       if (rc != 0)
-               GOTO(log, rc);
+                       rc = dt_xattr_del(env, obj, XATTR_NAME_LINK, handle,
+                                         BYPASS_CAPA);
+                       if (rc != 0)
+                               GOTO(stop, rc);
+               }
 
-       th = dt_trans_create(env, dev);
-       if (IS_ERR(th))
-               GOTO(log, rc = PTR_ERR(th));
+               if (newdata) {
+                       rc = linkea_data_new(&ldata,
+                                       &lfsck_env_info(env)->lti_linkea_buf);
+                       if (rc != 0)
+                               GOTO(stop, rc);
+               }
 
-       /* Set the ctime as zero, then others can know it is created for
-        * repairing dangling name entry by LFSCK. And if the LFSCK made
-        * wrong decision and the real MDT-object has been found later,
-        * then the LFSCK has chance to fix the incosistency properly. */
-       memset(la, 0, sizeof(*la));
-       la->la_mode = (type & S_IFMT) | 0600;
-       la->la_valid = LA_TYPE | LA_MODE | LA_UID | LA_GID |
-                       LA_ATIME | LA_MTIME | LA_CTIME;
+               rc = linkea_add_buf(&ldata, cname, pfid);
+               if (rc != 0)
+                       GOTO(stop, rc);
 
-       child->do_ops->do_ah_init(env, hint, parent, child,
-                                 la->la_mode & S_IFMT);
+               rc = lfsck_links_write(env, obj, &ldata, handle);
+               if (unlikely(rc == -ENOSPC) &&
+                   S_ISREG(lfsck_object_type(obj)) && !dt_object_remote(obj)) {
+                       if (handle != NULL) {
+                               LASSERT(dt_write_locked(env, obj));
 
-       memset(dof, 0, sizeof(*dof));
-       dof->dof_type = dt_mode_to_dft(type);
-       /* If the target is a regular file, then the LFSCK will only create
-        * the MDT-object without stripes (dof->dof_reg.striped = 0). related
-        * OST-objects will be created when write open. */
+                               dt_write_unlock(env, obj);
+                               dtlocked = false;
 
-       /* 1a. create child. */
-       rc = dt_declare_create(env, child, la, hint, dof, th);
-       if (rc != 0)
-               GOTO(stop, rc);
+                               dt_trans_stop(env, dev, handle);
+                               handle = NULL;
 
-       if (S_ISDIR(type)) {
-               if (unlikely(!dt_try_as_dir(env, child)))
-                       GOTO(stop, rc = -ENOTDIR);
+                               lfsck_ibits_unlock(&lh, LCK_EX);
+                       }
 
-               /* 2a. insert dot into child dir */
-               rec->rec_type = S_IFDIR;
-               rec->rec_fid = lfsck_dto2fid(child);
-               rc = dt_declare_insert(env, child,
-                                      (const struct dt_rec *)rec,
-                                      (const struct dt_key *)dot, th);
-               if (rc != 0)
-                       GOTO(stop, rc);
+                       rc = lfsck_namespace_trace_update(env, com,
+                                       &lnr->lnr_fid, LNTF_SKIP_NLINK, true);
+                       if (rc != 0)
+                               /* If we cannot record this object in the
+                                * LFSCK tracing, we have to mark the LFSCK
+                                * as LF_INCOMPLETE, then the LFSCK will
+                                * skip nlink attribute verification for
+                                * all objects. */
+                               ns->ln_flags |= LF_INCOMPLETE;
 
-               /* 3a. insert dotdot into child dir */
-               rec->rec_fid = lfsck_dto2fid(parent);
-               rc = dt_declare_insert(env, child,
-                                      (const struct dt_rec *)rec,
-                                      (const struct dt_key *)dotdot, th);
-               if (rc != 0)
-                       GOTO(stop, rc);
+                       GOTO(out, rc = 0);
+               }
 
-               /* 4a. increase child nlink */
-               rc = dt_declare_ref_add(env, child, th);
                if (rc != 0)
                        GOTO(stop, rc);
-       }
 
-       /* 5a. insert linkEA for child */
-       lfsck_buf_init(&linkea_buf, ldata.ld_buf->lb_buf,
-                      ldata.ld_leh->leh_len);
-       rc = dt_declare_xattr_set(env, child, &linkea_buf,
-                                 XATTR_NAME_LINK, 0, th);
-       if (rc != 0)
+               count = ldata.ld_leh->leh_reccount;
+               if (!S_ISDIR(lfsck_object_type(obj)) ||
+                   !dt_object_remote(obj)) {
+                       ns->ln_linkea_repaired++;
+                       repaired = true;
+                       log = true;
+               }
+       } else {
                GOTO(stop, rc);
+       }
 
-       rc = dt_trans_start(env, dev, th);
-       if (rc != 0)
-               GOTO(stop, rc = (rc == -EEXIST ? 1 : rc));
+record:
+       LASSERT(count > 0);
 
-       dt_write_lock(env, child, 0);
-       /* 1b. create child */
-       rc = dt_create(env, child, la, hint, dof, th);
+       rc = dt_attr_get(env, obj, la, BYPASS_CAPA);
        if (rc != 0)
-               GOTO(unlock, rc = (rc == -EEXIST ? 1 : rc));
+               GOTO(stop, rc);
 
-       if (S_ISDIR(type)) {
-               if (unlikely(!dt_try_as_dir(env, child)))
-                       GOTO(unlock, rc = -ENOTDIR);
+       if ((count == 1 && la->la_nlink == 1) ||
+           S_ISDIR(lfsck_object_type(obj)))
+               /* Usually, it is for single linked object or dir, do nothing.*/
+               GOTO(stop, rc);
 
-               /* 2b. insert dot into child dir */
-               rec->rec_type = S_IFDIR;
-               rec->rec_fid = lfsck_dto2fid(child);
-               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);
+       /* Following modification will be in another transaction.  */
+       if (handle != NULL) {
+               dt_write_unlock(env, obj);
+               dtlocked = false;
 
-               /* 3b. insert dotdot into child dir */
-               rec->rec_fid = lfsck_dto2fid(parent);
-               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);
+               dt_trans_stop(env, dev, handle);
+               handle = NULL;
 
-               /* 4b. increase child nlink */
-               rc = dt_ref_add(env, child, th);
-               if (rc != 0)
-                       GOTO(unlock, rc);
+               lfsck_ibits_unlock(&lh, LCK_EX);
        }
 
-       /* 5b. insert linkEA for child. */
-       rc = dt_xattr_set(env, child, &linkea_buf,
-                         XATTR_NAME_LINK, 0, th, BYPASS_CAPA);
-
-       GOTO(unlock, rc);
+       ns->ln_mul_linked_checked++;
+       rc = lfsck_namespace_trace_update(env, com, &lnr->lnr_fid,
+                                         LNTF_CHECK_LINKEA, true);
 
-unlock:
-       dt_write_unlock(env, child);
+       GOTO(out, rc);
 
 stop:
-       dt_trans_stop(env, dev, th);
+       if (dtlocked)
+               dt_write_unlock(env, obj);
 
-log:
-       lfsck_ibits_unlock(&lh, LCK_EX);
-       CDEBUG(D_LFSCK, "%s: namespace LFSCK assistant found dangling "
-              "reference for: parent "DFID", child "DFID", type %u, "
-              "name %s. %s: rc = %d\n", lfsck_lfsck2name(lfsck),
-              PFID(lfsck_dto2fid(parent)), PFID(lfsck_dto2fid(child)),
-              type, cname->ln_name,
-              create ? "Create the lost OST-object as required" :
-                       "Keep the MDT-object there by default", rc);
+       if (handle != NULL && !IS_ERR(handle))
+               dt_trans_stop(env, dev, handle);
 
-       if (rc <= 0) {
-               struct lfsck_namespace *ns = com->lc_file_ram;
+out:
+       lfsck_ibits_unlock(&lh, LCK_EX);
 
+       if (!name_is_dot_or_dotdot(lnr->lnr_name, lnr->lnr_namelen) &&
+           !lfsck_is_valid_slave_name_entry(env, lnr->lnr_lmv,
+                                            lnr->lnr_name, lnr->lnr_namelen) &&
+           type != LNIT_BAD_DIRENT) {
                ns->ln_flags |= LF_INCONSISTENT;
-       }
-
-       return rc;
-}
-
-static int lfsck_namespace_assistant_handler_p1(const struct lu_env *env,
-                                               struct lfsck_component *com,
-                                               struct lfsck_assistant_req *lar)
-{
-       struct lfsck_thread_info   *info     = lfsck_env_info(env);
-       struct lu_attr             *la       = &info->lti_la;
-       struct lfsck_instance      *lfsck    = com->lc_lfsck;
-       struct lfsck_bookmark      *bk       = &lfsck->li_bookmark_ram;
-       struct lfsck_namespace     *ns       = com->lc_file_ram;
-       struct linkea_data          ldata    = { 0 };
-       const struct lu_name       *cname;
-       struct thandle             *handle   = NULL;
-       struct lfsck_namespace_req *lnr      =
-                       container_of0(lar, struct lfsck_namespace_req, lnr_lar);
-       struct dt_object           *dir      = lnr->lnr_obj;
-       struct dt_object           *obj      = NULL;
-       const struct lu_fid        *pfid     = lfsck_dto2fid(dir);
-       struct dt_device           *dev;
-       struct lustre_handle        lh       = { 0 };
-       bool                        repaired = false;
-       bool                        dtlocked = false;
-       bool                        remove;
-       bool                        newdata;
-       bool                        log      = false;
-       int                         idx;
-       int                         count    = 0;
-       int                         rc;
-       enum lfsck_namespace_inconsistency_type type = LNIT_NONE;
-       ENTRY;
 
-       if (lnr->lnr_attr & LUDA_UPGRADE) {
-               ns->ln_flags |= LF_UPGRADE;
-               ns->ln_dirent_repaired++;
-               repaired = true;
-       } else if (lnr->lnr_attr & LUDA_REPAIR) {
-               ns->ln_flags |= LF_INCONSISTENT;
-               ns->ln_dirent_repaired++;
-               repaired = true;
+               log = false;
+               rc = lfsck_namespace_repair_bad_name_hash(env, com, dir,
+                                               lnr->lnr_lmv, lnr->lnr_name);
+               if (rc >= 0)
+                       bad_hash = true;
        }
 
-       if (unlikely(fid_is_zero(&lnr->lnr_fid))) {
-               if (strcmp(lnr->lnr_name, dotdot) != 0)
-                       LBUG();
-               else
-                       rc = lfsck_namespace_trace_update(env, com, pfid,
-                                               LNTF_CHECK_PARENT, true);
-
-               GOTO(out, rc);
+       if (rc >= 0) {
+               switch (type) {
+               case LNIT_BAD_TYPE:
+                       log = false;
+                       rc = lfsck_namespace_repair_dirent(env, com, dir,
+                                       obj, lnr->lnr_name, lnr->lnr_name,
+                                       lnr->lnr_type, true, false);
+                       if (rc > 0)
+                               repaired = true;
+                       break;
+               case LNIT_BAD_DIRENT:
+                       log = false;
+                       /* XXX: This is a bad dirent, we do not know whether
+                        *      the original name entry reference a regular
+                        *      file or a directory, then keep the parent's
+                        *      nlink count unchanged here. */
+                       rc = lfsck_namespace_repair_dirent(env, com, dir,
+                                       obj, lnr->lnr_name, lnr->lnr_name,
+                                       lnr->lnr_type, false, false);
+                       if (rc > 0)
+                               repaired = true;
+                       break;
+               default:
+                       break;
+               }
        }
 
-       if (lnr->lnr_name[0] == '.' &&
-           (lnr->lnr_namelen == 1 || fid_seq_is_dot(fid_seq(&lnr->lnr_fid))))
-               GOTO(out, rc = 0);
-
-       idx = lfsck_find_mdt_idx_by_fid(env, lfsck, &lnr->lnr_fid);
-       if (idx < 0)
-               GOTO(out, rc = idx);
-
-       if (idx == lfsck_dev_idx(lfsck->li_bottom)) {
-               if (unlikely(strcmp(lnr->lnr_name, dotdot) == 0))
-                       GOTO(out, rc = 0);
+       down_write(&com->lc_sem);
+       if (rc < 0) {
+               CDEBUG(D_LFSCK, "%s: namespace LFSCK assistant fail to handle "
+                      "the entry: "DFID", parent "DFID", name %.*s: rc = %d\n",
+                      lfsck_lfsck2name(lfsck), PFID(&lnr->lnr_fid),
+                      PFID(lfsck_dto2fid(lnr->lnr_obj)),
+                      lnr->lnr_namelen, lnr->lnr_name, rc);
 
-               dev = lfsck->li_next;
+               lfsck_namespace_record_failure(env, lfsck, ns);
+               if ((rc == -ENOTCONN || rc == -ESHUTDOWN || rc == -EREMCHG ||
+                    rc == -ETIMEDOUT || rc == -EHOSTDOWN ||
+                    rc == -EHOSTUNREACH || rc == -EINPROGRESS) &&
+                   dev != NULL && dev != lfsck->li_next)
+                       lfsck_lad_set_bitmap(env, com, idx);
+
+               if (!(bk->lb_param & LPF_FAILOUT))
+                       rc = 0;
        } else {
-               struct lfsck_tgt_desc *ltd;
+               if (log)
+                       CDEBUG(D_LFSCK, "%s: namespace LFSCK assistant "
+                              "repaired the entry: "DFID", parent "DFID
+                              ", name %.*s\n", lfsck_lfsck2name(lfsck),
+                              PFID(&lnr->lnr_fid),
+                              PFID(lfsck_dto2fid(lnr->lnr_obj)),
+                              lnr->lnr_namelen, lnr->lnr_name);
 
-               /* Usually, some local filesystem consistency verification
-                * tools can guarantee the local namespace tree consistenct.
-                * So the LFSCK will only verify the remote directory. */
-               if (unlikely(strcmp(lnr->lnr_name, dotdot) == 0)) {
-                       rc = lfsck_namespace_trace_update(env, com, pfid,
-                                               LNTF_CHECK_PARENT, true);
+               if (repaired) {
+                       ns->ln_items_repaired++;
 
-                       GOTO(out, rc);
+                       switch (type) {
+                       case LNIT_DANGLING:
+                               ns->ln_dangling_repaired++;
+                               break;
+                       case LNIT_BAD_TYPE:
+                               ns->ln_bad_type_repaired++;
+                               break;
+                       case LNIT_BAD_DIRENT:
+                               ns->ln_dirent_repaired++;
+                               break;
+                       default:
+                               break;
+                       }
+
+                       if (bk->lb_param & LPF_DRYRUN &&
+                           lfsck_pos_is_zero(&ns->ln_pos_first_inconsistent))
+                               lfsck_pos_fill(env, lfsck,
+                                              &ns->ln_pos_first_inconsistent,
+                                              false);
                }
 
-               ltd = LTD_TGT(&lfsck->li_mdt_descs, idx);
-               if (unlikely(ltd == NULL)) {
-                       CDEBUG(D_LFSCK, "%s: cannot talk with MDT %x which "
-                              "did not join the namespace LFSCK\n",
-                              lfsck_lfsck2name(lfsck), idx);
-                       ns->ln_flags |= LF_INCOMPLETE;
+               if (bad_hash) {
+                       ns->ln_name_hash_repaired++;
 
-                       GOTO(out, rc = -ENODEV);
+                       /* Not count repeatedly. */
+                       if (!repaired)
+                               ns->ln_items_repaired++;
+
+                       if (bk->lb_param & LPF_DRYRUN &&
+                           lfsck_pos_is_zero(&ns->ln_pos_first_inconsistent))
+                               lfsck_pos_fill(env, lfsck,
+                                              &ns->ln_pos_first_inconsistent,
+                                              false);
                }
 
-               dev = ltd->ltd_tgt;
+
+               rc = 0;
        }
+       up_write(&com->lc_sem);
 
-       obj = lfsck_object_find_by_dev(env, dev, &lnr->lnr_fid);
-       if (IS_ERR(obj))
-               GOTO(out, rc = PTR_ERR(obj));
+       if (obj != NULL && !IS_ERR(obj))
+               lfsck_object_put(env, obj);
 
-       cname = lfsck_name_get_const(env, lnr->lnr_name, lnr->lnr_namelen);
-       if (dt_object_exists(obj) == 0) {
+       return rc;
+}
 
-dangling:
-               rc = lfsck_namespace_check_exist(env, dir, obj, lnr->lnr_name);
-               if (rc == 0) {
-                       type = LNIT_DANGLING;
-                       rc = lfsck_namespace_repair_dangling(env, com,
-                                                            obj, lnr);
-                       if (rc == 0)
-                               repaired = true;
-               }
+/**
+ * Handle one orphan under the backend /lost+found directory
+ *
+ * Insert the orphan FID into the namespace LFSCK trace file for further
+ * processing (via the subsequent namespace LFSCK second-stage scanning).
+ * At the same time, remove the orphan name entry from backend /lost+found
+ * directory. There is an interval between the orphan name entry removed
+ * from the backend /lost+found directory and the orphan FID in the LFSCK
+ * trace file handled. In such interval, the LFSCK can be reset, then
+ * all the FIDs recorded in the namespace LFSCK trace file will be dropped.
+ * To guarantee that the orphans can be found when LFSCK run next time
+ * without e2fsck again, when remove the orphan name entry, the LFSCK
+ * will set the orphan's ctime attribute as 1. Since normal applications
+ * cannot change the object's ctime attribute as 1. Then when LFSCK run
+ * next time, it can record the object (that ctime is 1) in the namespace
+ * LFSCK trace file during the first-stage scanning.
+ *
+ * \param[in] env      pointer to the thread context
+ * \param[in] com      pointer to the lfsck component
+ * \param[in] parent   pointer to the object for the backend /lost+found
+ * \param[in] ent      pointer to the name entry for the target under the
+ *                     backend /lost+found
+ *
+ * \retval             positive for repaired
+ * \retval             0 if needs to repair nothing
+ * \retval             negative error number on failure
+ */
+static int lfsck_namespace_scan_local_lpf_one(const struct lu_env *env,
+                                             struct lfsck_component *com,
+                                             struct dt_object *parent,
+                                             struct lu_dirent *ent)
+{
+       struct lfsck_thread_info        *info   = lfsck_env_info(env);
+       struct lu_fid                   *key    = &info->lti_fid;
+       struct lu_attr                  *la     = &info->lti_la;
+       struct lfsck_instance           *lfsck  = com->lc_lfsck;
+       struct dt_object                *obj    = com->lc_obj;
+       struct dt_device                *dev    = lfsck->li_bottom;
+       struct dt_object                *child  = NULL;
+       struct thandle                  *th     = NULL;
+       int                              rc     = 0;
+       __u8                             flags  = 0;
+       bool                             exist  = false;
+       ENTRY;
+
+       child = lfsck_object_find_by_dev(env, dev, &ent->lde_fid);
+       if (IS_ERR(child))
+               RETURN(PTR_ERR(child));
+
+       LASSERT(dt_object_exists(child));
+       LASSERT(!dt_object_remote(child));
 
+       fid_cpu_to_be(key, &ent->lde_fid);
+       rc = dt_lookup(env, obj, (struct dt_rec *)&flags,
+                      (const struct dt_key *)key, BYPASS_CAPA);
+       if (rc == 0) {
+               exist = true;
+               flags |= LNTF_CHECK_ORPHAN;
+       } else if (rc == -ENOENT) {
+               flags = LNTF_CHECK_ORPHAN;
+       } else {
                GOTO(out, rc);
        }
 
-       if (!(bk->lb_param & LPF_DRYRUN) && repaired) {
-
-again:
-               rc = lfsck_ibits_lock(env, lfsck, obj, &lh,
-                                     MDS_INODELOCK_UPDATE |
-                                     MDS_INODELOCK_XATTR, LCK_EX);
-               if (rc != 0)
-                       GOTO(out, rc);
+       th = dt_trans_create(env, dev);
+       if (IS_ERR(th))
+               GOTO(out, rc = PTR_ERR(th));
 
-               handle = dt_trans_create(env, dev);
-               if (IS_ERR(handle))
-                       GOTO(out, rc = PTR_ERR(handle));
+       /* a1. remove name entry from backend /lost+found */
+       rc = dt_declare_delete(env, parent,
+                              (const struct dt_key *)ent->lde_name, th);
+       if (rc != 0)
+               GOTO(stop, rc);
 
-               rc = lfsck_declare_namespace_exec_dir(env, obj, handle);
+       if (S_ISDIR(lfsck_object_type(child))) {
+               /* a2. decrease parent's nlink */
+               rc = dt_declare_ref_del(env, parent, th);
                if (rc != 0)
                        GOTO(stop, rc);
+       }
 
-               rc = dt_trans_start(env, dev, handle);
+       if (exist) {
+               /* a3. remove child's FID from the LFSCK trace file. */
+               rc = dt_declare_delete(env, obj,
+                                      (const struct dt_key *)key, th);
+               if (rc != 0)
+                       GOTO(stop, rc);
+       } else {
+               /* a4. set child's ctime as 1 */
+               memset(la, 0, sizeof(*la));
+               la->la_ctime = 1;
+               la->la_valid = LA_CTIME;
+               rc = dt_declare_attr_set(env, child, la, th);
                if (rc != 0)
                        GOTO(stop, rc);
-
-               dt_write_lock(env, obj, 0);
-               dtlocked = true;
        }
 
-       rc = lfsck_namespace_check_exist(env, dir, obj, lnr->lnr_name);
+       /* a5. insert child's FID into the LFSCK trace file. */
+       rc = dt_declare_insert(env, obj, (const struct dt_rec *)&flags,
+                              (const struct dt_key *)key, th);
        if (rc != 0)
                GOTO(stop, rc);
 
-       rc = lfsck_links_read(env, obj, &ldata);
-       if (unlikely(rc == -ENOENT)) {
-               if (handle != NULL) {
-                       dt_write_unlock(env, obj);
-                       dtlocked = false;
+       rc = dt_trans_start_local(env, dev, th);
+       if (rc != 0)
+               GOTO(stop, rc);
 
-                       dt_trans_stop(env, dev, handle);
-                       handle = NULL;
+       /* b1. remove name entry from backend /lost+found */
+       rc = dt_delete(env, parent, (const struct dt_key *)ent->lde_name, th,
+                      BYPASS_CAPA);
+       if (rc != 0)
+               GOTO(stop, rc);
 
-                       lfsck_ibits_unlock(&lh, LCK_EX);
-               }
+       if (S_ISDIR(lfsck_object_type(child))) {
+               /* b2. decrease parent's nlink */
+               dt_write_lock(env, parent, 0);
+               rc = dt_ref_del(env, parent, th);
+               dt_write_unlock(env, parent);
+               if (rc != 0)
+                       GOTO(stop, rc);
+       }
 
-               /* It may happen when the remote object has been removed,
-                * but the local MDT is not aware of that. */
-               goto dangling;
-       } else if (rc == 0) {
-               count = ldata.ld_leh->leh_reccount;
-               rc = linkea_links_find(&ldata, cname, pfid);
-               if ((rc == 0) &&
-                   (count == 1 || !S_ISDIR(lfsck_object_type(obj)))) {
-                       if ((lfsck_object_type(obj) & S_IFMT) !=
-                           lnr->lnr_type) {
-                               ns->ln_flags |= LF_INCONSISTENT;
-                               type = LNIT_BAD_TYPE;
-                       }
+       if (exist) {
+               /* a3. remove child's FID from the LFSCK trace file. */
+               rc = dt_delete(env, obj, (const struct dt_key *)key, th,
+                              BYPASS_CAPA);
+               if (rc != 0)
+                       GOTO(stop, rc);
+       } else {
+               /* b4. set child's ctime as 1 */
+               rc = dt_attr_set(env, child, la, th, BYPASS_CAPA);
+               if (rc != 0)
+                       GOTO(stop, rc);
+       }
 
-                       goto record;
-               }
+       /* b5. insert child's FID into the LFSCK trace file. */
+       rc = dt_insert(env, obj, (const struct dt_rec *)&flags,
+                      (const struct dt_key *)key, th, BYPASS_CAPA, 1);
 
-               ns->ln_flags |= LF_INCONSISTENT;
+       GOTO(stop, rc = (rc == 0 ? 1 : rc));
 
-               /* If the file type stored in the name entry does not match
-                * the file type claimed by the object, and the object does
-                * not recognize the name entry, then it is quite possible
-                * that the name entry is corrupted. */
-               if ((lfsck_object_type(obj) & S_IFMT) != lnr->lnr_type) {
-                       type = LNIT_BAD_DIRENT;
+stop:
+       dt_trans_stop(env, dev, th);
 
-                       GOTO(stop, rc = 0);
-               }
+out:
+       lu_object_put(env, &child->do_lu);
 
-               /* For sub-dir object, we cannot make sure whether the sub-dir
-                * back references the parent via ".." name entry correctly or
-                * not in the LFSCK first-stage scanning. It may be that the
-                * (remote) sub-dir ".." name entry has no parent FID after
-                * file-level backup/restore and its linkEA may be wrong.
-                * So under such case, we should replace the linkEA according
-                * to current name entry. But this needs to be done during the
-                * LFSCK second-stage scanning. The LFSCK will record the name
-                * entry for further possible using. */
-               remove = false;
-               newdata = false;
-               goto nodata;
-       } else if (unlikely(rc == -EINVAL)) {
-               if ((lfsck_object_type(obj) & S_IFMT) != lnr->lnr_type)
-                       type = LNIT_BAD_TYPE;
+       return rc;
+}
 
-               count = 1;
-               ns->ln_flags |= LF_INCONSISTENT;
-               /* The magic crashed, we are not sure whether there are more
-                * corrupt data in the linkea, so remove all linkea entries. */
-               remove = true;
-               newdata = true;
-               goto nodata;
-       } else if (rc == -ENODATA) {
-               if ((lfsck_object_type(obj) & S_IFMT) != lnr->lnr_type)
-                       type = LNIT_BAD_TYPE;
+/**
+ * Handle orphans under the backend /lost+found directory
+ *
+ * Some backend checker, such as e2fsck for ldiskfs may find some orphans
+ * and put them under the backend /lost+found directory that is invisible
+ * to client. The LFSCK will scan such directory, for the original client
+ * visible orphans, add their fids into the namespace LFSCK trace file,
+ * then the subsenquent namespace LFSCK second-stage scanning can handle
+ * them as other objects to be double scanned: either move back to normal
+ * namespace, or to the global visible orphan directory:
+ * /ROOT/.lustre/lost+found/MDTxxxx/
+ *
+ * \param[in] env      pointer to the thread context
+ * \param[in] com      pointer to the lfsck component
+ */
+static void lfsck_namespace_scan_local_lpf(const struct lu_env *env,
+                                          struct lfsck_component *com)
+{
+       struct lfsck_thread_info        *info   = lfsck_env_info(env);
+       struct lu_dirent                *ent    =
+                                       (struct lu_dirent *)info->lti_key;
+       struct lu_seq_range             *range  = &info->lti_range;
+       struct lfsck_instance           *lfsck  = com->lc_lfsck;
+       struct ptlrpc_thread            *thread = &lfsck->li_thread;
+       struct lfsck_bookmark           *bk     = &lfsck->li_bookmark_ram;
+       struct dt_device                *dev    = lfsck->li_bottom;
+       struct lfsck_namespace          *ns     = com->lc_file_ram;
+       struct dt_object                *parent;
+       const struct dt_it_ops          *iops;
+       struct dt_it                    *di;
+       struct seq_server_site          *ss     =
+                                       lu_site2seq(dev->dd_lu_dev.ld_site);
+       __u64                            cookie;
+       int                              rc     = 0;
+       __u16                            type;
+       ENTRY;
+
+       parent = lfsck_object_find_by_dev(env, dev, &LU_BACKEND_LPF_FID);
+       if (IS_ERR(parent)) {
+               CERROR("%s: fail to find backend /lost+found: rc = %ld\n",
+                      lfsck_lfsck2name(lfsck), PTR_ERR(parent));
+               RETURN_EXIT;
+       }
+
+       /* It is normal that the /lost+found does not exist for ZFS backend. */
+       if (!dt_object_exists(parent))
+               GOTO(out, rc = 0);
+
+       if (unlikely(!dt_try_as_dir(env, parent)))
+               GOTO(out, rc = -ENOTDIR);
+
+       CDEBUG(D_LFSCK, "%s: start to scan backend /lost+found\n",
+              lfsck_lfsck2name(lfsck));
+
+       com->lc_new_scanned = 0;
+       iops = &parent->do_index_ops->dio_it;
+       di = iops->init(env, parent, LUDA_64BITHASH | LUDA_TYPE, BYPASS_CAPA);
+       if (IS_ERR(di))
+               GOTO(out, rc = PTR_ERR(di));
+
+       rc = iops->load(env, di, 0);
+       if (rc == 0)
+               rc = iops->next(env, di);
+       else if (rc > 0)
+               rc = 0;
+
+       while (rc == 0) {
+               if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_DELAY3) &&
+                   cfs_fail_val > 0) {
+                       struct l_wait_info lwi;
 
-               count = 1;
-               ns->ln_flags |= LF_UPGRADE;
-               remove = false;
-               newdata = true;
+                       lwi = LWI_TIMEOUT(cfs_time_seconds(cfs_fail_val),
+                                         NULL, NULL);
+                       l_wait_event(thread->t_ctl_waitq,
+                                    !thread_is_running(thread),
+                                    &lwi);
 
-nodata:
-               if (bk->lb_param & LPF_DRYRUN) {
-                       ns->ln_linkea_repaired++;
-                       repaired = true;
-                       log = true;
-                       goto record;
+                       if (unlikely(!thread_is_running(thread)))
+                               break;
                }
 
-               if (!lustre_handle_is_used(&lh))
-                       goto again;
+               rc = iops->rec(env, di, (struct dt_rec *)ent,
+                              LUDA_64BITHASH | LUDA_TYPE);
+               if (rc == 0)
+                       rc = lfsck_unpack_ent(ent, &cookie, &type);
 
-               if (remove) {
-                       LASSERT(newdata);
+               if (unlikely(rc != 0)) {
+                       CDEBUG(D_LFSCK, "%s: fail to iterate backend "
+                              "/lost+found: rc = %d\n",
+                              lfsck_lfsck2name(lfsck), rc);
 
-                       rc = dt_xattr_del(env, obj, XATTR_NAME_LINK, handle,
-                                         BYPASS_CAPA);
-                       if (rc != 0)
-                               GOTO(stop, rc);
+                       goto skip;
                }
 
-               if (newdata) {
-                       rc = linkea_data_new(&ldata,
-                                       &lfsck_env_info(env)->lti_linkea_buf);
+               /* skip dot and dotdot entries */
+               if (name_is_dot_or_dotdot(ent->lde_name, ent->lde_namelen))
+                       goto next;
+
+               if (!fid_seq_in_fldb(fid_seq(&ent->lde_fid)))
+                       goto skip;
+
+               if (fid_is_norm(&ent->lde_fid)) {
+                       fld_range_set_mdt(range);
+                       rc = fld_local_lookup(env, ss->ss_server_fld,
+                                             fid_seq(&ent->lde_fid), range);
                        if (rc != 0)
-                               GOTO(stop, rc);
+                               goto skip;
+               } else if (lfsck_dev_idx(dev) != 0) {
+                       /* If the returned FID is IGIF, then there are three
+                        * possible cases:
+                        *
+                        * 1) The object is upgraded from old Lustre-1.8 with
+                        *    IGIF assigned to such object.
+                        * 2) The object is a backend local object and is
+                        *    invisible to client.
+                        * 3) The object lost its LMV EA, and since there is
+                        *    no FID-in-dirent for the orphan in the backend
+                        *    /lost+found directory, then the low layer will
+                        *    return IGIF for such object.
+                        *
+                        * For MDTx (x != 0), it is either case 2) or case 3),
+                        * but from the LFSCK view, they are indistinguishable.
+                        * To be safe, the LFSCK will keep it there and report
+                        * some message, then the adminstrator can handle that
+                        * furtherly.
+                        *
+                        * For MDT0, it is more possible the case 1). The LFSCK
+                        * will handle the orphan as an upgraded object. */
+                       CDEBUG(D_LFSCK, "%s: the orphan %.*s with IGIF "DFID
+                              "in the backend /lost+found on the MDT %04x, "
+                              "to be safe, skip it.\n",
+                              lfsck_lfsck2name(lfsck), ent->lde_namelen,
+                              ent->lde_name, PFID(&ent->lde_fid),
+                              lfsck_dev_idx(dev));
+                       goto skip;
                }
 
-               rc = linkea_add_buf(&ldata, cname, pfid);
-               if (rc != 0)
-                       GOTO(stop, rc);
+               rc = lfsck_namespace_scan_local_lpf_one(env, com, parent, ent);
 
-               rc = lfsck_links_write(env, obj, &ldata, handle);
-               if (rc != 0)
-                       GOTO(stop, rc);
+skip:
+               down_write(&com->lc_sem);
+               com->lc_new_scanned++;
+               ns->ln_local_lpf_scanned++;
+               if (rc > 0)
+                       ns->ln_local_lpf_moved++;
+               else if (rc == 0)
+                       ns->ln_local_lpf_skipped++;
+               else
+                       ns->ln_local_lpf_failed++;
+               up_write(&com->lc_sem);
 
-               count = ldata.ld_leh->leh_reccount;
-               if (!S_ISDIR(lfsck_object_type(obj)) ||
-                   !dt_object_remote(obj)) {
-                       ns->ln_linkea_repaired++;
-                       repaired = true;
-                       log = true;
+               if (rc < 0 && bk->lb_param & LPF_FAILOUT)
+                       break;
+
+next:
+               lfsck_control_speed_by_self(com);
+               if (unlikely(!thread_is_running(thread))) {
+                       rc = 0;
+                       break;
                }
-       } else {
-               GOTO(stop, rc);
+
+               rc = iops->next(env, di);
        }
 
-record:
-       LASSERT(count > 0);
+       iops->put(env, di);
+       iops->fini(env, di);
 
-       rc = dt_attr_get(env, obj, la, BYPASS_CAPA);
-       if (rc != 0)
-               GOTO(stop, rc);
+       EXIT;
 
-       if ((count == 1 && la->la_nlink == 1) ||
-           S_ISDIR(lfsck_object_type(obj)))
-               /* Usually, it is for single linked object or dir, do nothing.*/
-               GOTO(stop, rc);
+out:
+       CDEBUG(D_LFSCK, "%s: stop to scan backend /lost+found: rc = %d\n",
+              lfsck_lfsck2name(lfsck), rc);
 
-       /* Following modification will be in another transaction.  */
-       if (handle != NULL) {
-               dt_write_unlock(env, obj);
-               dtlocked = false;
+       lu_object_put(env, &parent->do_lu);
+}
 
-               dt_trans_stop(env, dev, handle);
-               handle = NULL;
+/**
+ * Rescan the striped directory after the master LMV EA reset.
+ *
+ * Sometimes, the master LMV EA of the striped directory maybe lost, so when
+ * the namespace LFSCK engine scan the striped directory for the first time,
+ * it will be regarded as a normal directory. As the LFSCK processing, some
+ * other LFSCK instance on other MDT will find the shard of this striped dir,
+ * and find that the master MDT-object of the striped directory lost its LMV
+ * EA, then such remote LFSCK instance will regenerate the master LMV EA and
+ * notify the LFSCK instance on this MDT to rescan the striped directory.
+ *
+ * \param[in] env      pointer to the thread context
+ * \param[in] com      pointer to the lfsck component
+ * \param[in] llu      the lfsck_lmv_unit that contains the striped directory
+ *                     to be rescanned.
+ *
+ * \retval             positive number for success
+ * \retval             0 for LFSCK stopped/paused
+ * \retval             negative error number on failure
+ */
+static int lfsck_namespace_rescan_striped_dir(const struct lu_env *env,
+                                             struct lfsck_component *com,
+                                             struct lfsck_lmv_unit *llu)
+{
+       struct lfsck_thread_info        *info   = lfsck_env_info(env);
+       struct lfsck_instance           *lfsck  = com->lc_lfsck;
+       struct lfsck_assistant_data     *lad    = com->lc_data;
+       struct dt_object                *dir;
+       const struct dt_it_ops          *iops;
+       struct dt_it                    *di;
+       struct lu_dirent                *ent    =
+                       (struct lu_dirent *)info->lti_key;
+       struct lfsck_bookmark           *bk     = &lfsck->li_bookmark_ram;
+       struct ptlrpc_thread            *thread = &lfsck->li_thread;
+       struct lfsck_namespace_req      *lnr;
+       struct lfsck_assistant_req      *lar;
+       int                              rc;
+       __u16                            type;
+       ENTRY;
 
-               lfsck_ibits_unlock(&lh, LCK_EX);
-       }
+       LASSERT(list_empty(&lad->lad_req_list));
 
-       ns->ln_mul_linked_checked++;
-       rc = lfsck_namespace_trace_update(env, com, &lnr->lnr_fid,
-                                         LNTF_CHECK_LINKEA, true);
+       lfsck->li_lmv = &llu->llu_lmv;
+       lfsck->li_obj_dir = lfsck_object_get(llu->llu_obj);
+       rc = lfsck_open_dir(env, lfsck, 0);
+       if (rc != 0)
+               RETURN(rc);
 
-       GOTO(out, rc);
+       dir = lfsck->li_obj_dir;
+       di = lfsck->li_di_dir;
+       iops = &dir->do_index_ops->dio_it;
+       do {
+               rc = iops->rec(env, di, (struct dt_rec *)ent,
+                              lfsck->li_args_dir);
+               if (rc == 0)
+                       rc = lfsck_unpack_ent(ent, &lfsck->li_cookie_dir,
+                                             &type);
 
-stop:
-       if (dtlocked)
-               dt_write_unlock(env, obj);
+               if (rc != 0) {
+                       if (bk->lb_param & LPF_FAILOUT)
+                               GOTO(out, rc);
 
-       if (handle != NULL && !IS_ERR(handle))
-               dt_trans_stop(env, dev, handle);
+                       goto next;
+               }
 
-out:
-       lfsck_ibits_unlock(&lh, LCK_EX);
+               if (name_is_dot_or_dotdot(ent->lde_name, ent->lde_namelen))
+                       goto next;
 
-       if (rc >= 0) {
-               switch (type) {
-               case LNIT_BAD_TYPE:
-                       log = false;
-                       rc = lfsck_namespace_repair_dirent(env, com, dir,
-                                       obj, lnr->lnr_name, lnr->lnr_name,
-                                       lnr->lnr_type, true, false);
-                       if (rc > 0)
-                               repaired = true;
-                       break;
-               case LNIT_BAD_DIRENT:
-                       log = false;
-                       /* XXX: This is a bad dirent, we do not know whether
-                        *      the original name entry reference a regular
-                        *      file or a directory, then keep the parent's
-                        *      nlink count unchanged here. */
-                       rc = lfsck_namespace_repair_dirent(env, com, dir,
-                                       obj, lnr->lnr_name, lnr->lnr_name,
-                                       lnr->lnr_type, false, false);
-                       if (rc > 0)
-                               repaired = true;
-                       break;
-               default:
-                       break;
+               lnr = lfsck_namespace_assistant_req_init(lfsck, ent, type);
+               if (IS_ERR(lnr)) {
+                       if (bk->lb_param & LPF_FAILOUT)
+                               GOTO(out, rc = PTR_ERR(lnr));
+
+                       goto next;
                }
-       }
 
-       down_write(&com->lc_sem);
-       if (rc < 0) {
-               CDEBUG(D_LFSCK, "%s: namespace LFSCK assistant fail to handle "
-                      "the entry: "DFID", parent "DFID", name %.*s: rc = %d\n",
-                      lfsck_lfsck2name(lfsck), PFID(&lnr->lnr_fid),
-                      PFID(lfsck_dto2fid(lnr->lnr_obj)),
-                      lnr->lnr_namelen, lnr->lnr_name, rc);
+               lar = &lnr->lnr_lar;
+               rc = lfsck_namespace_assistant_handler_p1(env, com, lar);
+               lfsck_namespace_assistant_req_fini(env, lar);
+               if (rc != 0 && bk->lb_param & LPF_FAILOUT)
+                       GOTO(out, rc);
 
-               lfsck_namespace_record_failure(env, lfsck, ns);
-               if (!(bk->lb_param & LPF_FAILOUT))
-                       rc = 0;
-       } else {
-               if (log)
-                       CDEBUG(D_LFSCK, "%s: namespace LFSCK assistant "
-                              "repaired the entry: "DFID", parent "DFID
-                              ", name %.*s\n", lfsck_lfsck2name(lfsck),
-                              PFID(&lnr->lnr_fid),
-                              PFID(lfsck_dto2fid(lnr->lnr_obj)),
-                              lnr->lnr_namelen, lnr->lnr_name);
+               if (unlikely(!thread_is_running(thread)))
+                       GOTO(out, rc = 0);
 
-               if (repaired) {
-                       ns->ln_items_repaired++;
+next:
+               rc = iops->next(env, di);
+       } while (rc == 0);
 
-                       switch (type) {
-                       case LNIT_DANGLING:
-                               ns->ln_dangling_repaired++;
-                               break;
-                       case LNIT_BAD_TYPE:
-                               ns->ln_bad_type_repaired++;
-                               break;
-                       case LNIT_BAD_DIRENT:
-                               ns->ln_dirent_repaired++;
-                               break;
-                       default:
-                               break;
-                       }
+out:
+       lfsck_close_dir(env, lfsck, rc);
+       if (rc <= 0)
+               RETURN(rc);
 
-                       if (bk->lb_param & LPF_DRYRUN &&
-                           lfsck_pos_is_zero(&ns->ln_pos_first_inconsistent))
-                               lfsck_pos_fill(env, lfsck,
-                                              &ns->ln_pos_first_inconsistent,
-                                              false);
-               }
+       /* The close_dir() may insert a dummy lnr in the lad->lad_req_list. */
+       if (list_empty(&lad->lad_req_list))
+               RETURN(1);
 
-               rc = 0;
-       }
-       up_write(&com->lc_sem);
+       spin_lock(&lad->lad_lock);
+       lar = list_entry(lad->lad_req_list.next, struct lfsck_assistant_req,
+                         lar_list);
+       list_del_init(&lar->lar_list);
+       spin_unlock(&lad->lad_lock);
 
-       if (obj != NULL && !IS_ERR(obj))
-               lfsck_object_put(env, obj);
-       return rc;
+       rc = lfsck_namespace_assistant_handler_p1(env, com, lar);
+       lfsck_namespace_assistant_req_fini(env, lar);
+
+       RETURN(rc == 0 ? 1 : rc);
 }
 
 static int lfsck_namespace_assistant_handler_p2(const struct lu_env *env,
@@ -3898,9 +5927,25 @@ static int lfsck_namespace_assistant_handler_p2(const struct lu_env *env,
        __u8                     flags  = 0;
        ENTRY;
 
+       while (!list_empty(&lfsck->li_list_lmv)) {
+               struct lfsck_lmv_unit *llu;
+
+               spin_lock(&lfsck->li_lock);
+               llu = list_entry(lfsck->li_list_lmv.next,
+                                struct lfsck_lmv_unit, llu_link);
+               list_del_init(&llu->llu_link);
+               spin_unlock(&lfsck->li_lock);
+
+               rc = lfsck_namespace_rescan_striped_dir(env, com, llu);
+               if (rc <= 0)
+                       RETURN(rc);
+       }
+
        CDEBUG(D_LFSCK, "%s: namespace LFSCK phase2 scan start\n",
               lfsck_lfsck2name(lfsck));
 
+       lfsck_namespace_scan_local_lpf(env, com);
+
        com->lc_new_checked = 0;
        com->lc_new_scanned = 0;
        com->lc_time_last_checkpoint = cfs_time_current();
@@ -3943,7 +5988,7 @@ static int lfsck_namespace_assistant_handler_p2(const struct lu_env *env,
                        goto checkpoint;
                }
 
-               target = lfsck_object_find(env, lfsck, &fid);
+               target = lfsck_object_find_by_dev(env, lfsck->li_bottom, &fid);
                if (IS_ERR(target)) {
                        rc = PTR_ERR(target);
                        goto checkpoint;
@@ -4059,8 +6104,9 @@ static int lfsck_namespace_double_scan_result(const struct lu_env *env,
                ns->ln_time_last_complete = ns->ln_time_last_checkpoint;
                ns->ln_success_count++;
        } else if (rc == 0) {
-               ns->ln_status = lfsck->li_status;
-               if (ns->ln_status == 0)
+               if (lfsck->li_status != 0)
+                       ns->ln_status = lfsck->li_status;
+               else
                        ns->ln_status = LS_STOPPED;
        } else {
                ns->ln_status = LS_FAILED;
@@ -4072,11 +6118,102 @@ static int lfsck_namespace_double_scan_result(const struct lu_env *env,
        return rc;
 }
 
+static int
+lfsck_namespace_assistant_sync_failures_interpret(const struct lu_env *env,
+                                                 struct ptlrpc_request *req,
+                                                 void *args, int rc)
+{
+       return 0;
+}
+
+/**
+ * Notify remote LFSCK instances about former failures.
+ *
+ * The local LFSCK instance has recorded which MDTs have ever failed to respond
+ * some LFSCK verification requests (maybe because of network issues or the MDT
+ * itself trouble). During the respond gap the MDT may missed some name entries
+ * verification, then the MDT cannot know whether related MDT-objects have been
+ * referenced by related name entries or not, then in the second-stage scanning,
+ * these MDT-objects will be regarded as orphan, if the MDT-object contains bad
+ * linkEA for back reference, then it will misguide the LFSCK to generate wrong
+ * name entry for repairing the orphan.
+ *
+ * To avoid above trouble, when layout LFSCK finishes the first-stage scanning,
+ * it will scan the bitmap for the ever failed MDTs, and notify them that they
+ * have ever missed some name entries verification and should skip the handling
+ * for orphan MDT-objects.
+ *
+ * \param[in] env      pointer to the thread context
+ * \param[in] com      pointer to the lfsck component
+ * \param[in] lr       pointer to the lfsck request
+ */
 static void lfsck_namespace_assistant_sync_failures(const struct lu_env *env,
                                                    struct lfsck_component *com,
                                                    struct lfsck_request *lr)
 {
-       /* XXX: TBD */
+       struct lfsck_async_interpret_args *laia  =
+                               &lfsck_env_info(env)->lti_laia2;
+       struct lfsck_assistant_data       *lad   = com->lc_data;
+       struct lfsck_namespace            *ns    = com->lc_file_ram;
+       struct lfsck_instance             *lfsck = com->lc_lfsck;
+       struct lfsck_tgt_descs            *ltds  = &lfsck->li_mdt_descs;
+       struct lfsck_tgt_desc             *ltd;
+       struct ptlrpc_request_set         *set;
+       int                                rc    = 0;
+       ENTRY;
+
+       set = ptlrpc_prep_set();
+       if (set == NULL)
+               GOTO(out, rc = -ENOMEM);
+
+       lr->lr_flags2 = ns->ln_flags | LF_INCOMPLETE;
+       memset(laia, 0, sizeof(*laia));
+       lad->lad_touch_gen++;
+
+       spin_lock(&ltds->ltd_lock);
+       while (!list_empty(&lad->lad_mdt_list)) {
+               ltd = list_entry(lad->lad_mdt_list.next,
+                                struct lfsck_tgt_desc,
+                                ltd_namespace_list);
+               if (ltd->ltd_namespace_gen == lad->lad_touch_gen)
+                       break;
+
+               ltd->ltd_namespace_gen = lad->lad_touch_gen;
+               list_move_tail(&ltd->ltd_namespace_list,
+                              &lad->lad_mdt_list);
+               if (!lad->lad_incomplete ||
+                   !cfs_bitmap_check(lad->lad_bitmap, ltd->ltd_index)) {
+                       ltd->ltd_namespace_failed = 0;
+                       continue;
+               }
+
+               ltd->ltd_namespace_failed = 1;
+               spin_unlock(&ltds->ltd_lock);
+               rc = lfsck_async_request(env, ltd->ltd_exp, lr, set,
+                       lfsck_namespace_assistant_sync_failures_interpret,
+                       laia, LFSCK_NOTIFY);
+               if (rc != 0)
+                       CDEBUG(D_LFSCK, "%s: namespace LFSCK assistant fail "
+                              "to sync failure with MDT %x: rc = %d\n",
+                              lfsck_lfsck2name(lfsck), ltd->ltd_index, rc);
+
+               spin_lock(&ltds->ltd_lock);
+       }
+       spin_unlock(&ltds->ltd_lock);
+
+       rc = ptlrpc_set_wait(set);
+       ptlrpc_set_destroy(set);
+
+       GOTO(out, rc);
+
+out:
+       if (rc != 0)
+               CDEBUG(D_LFSCK, "%s: namespace LFSCK assistant fail "
+                      "to sync failure with MDTs, and related MDTs "
+                      "may handle orphan improperly: rc = %d\n",
+                      lfsck_lfsck2name(lfsck), rc);
+
+       EXIT;
 }
 
 struct lfsck_assistant_operations lfsck_namespace_assistant_ops = {
@@ -4426,10 +6563,10 @@ int lfsck_namespace_setup(const struct lu_env *env,
                GOTO(out, rc);
 
        rc = lfsck_namespace_load(env, com);
-       if (rc > 0)
-               rc = lfsck_namespace_reset(env, com, true);
-       else if (rc == -ENODATA)
+       if (rc == -ENODATA)
                rc = lfsck_namespace_init(env, com);
+       else if (rc < 0)
+               rc = lfsck_namespace_reset(env, com, true);
        if (rc != 0)
                GOTO(out, rc);