Whamcloud - gitweb
LU-14119 lfsck: replace dt_lookup() with dt_lookup_dir()
[fs/lustre-release.git] / lustre / lfsck / lfsck_striped_dir.c
index 7a4c09f..2980277 100644 (file)
@@ -20,7 +20,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2014, Intel Corporation.
+ * Copyright (c) 2014, 2017, Intel Corporation.
  */
 /*
  * lustre/lfsck/lfsck_striped_dir.c
 
 #define DEBUG_SUBSYSTEM S_LFSCK
 
-#include <lustre/lustre_idl.h>
 #include <lu_object.h>
 #include <dt_object.h>
 #include <md_object.h>
 #include <lustre_lib.h>
 #include <lustre_net.h>
 #include <lustre_lmv.h>
-#include <lustre/lustre_user.h>
 
 #include "lfsck_internal.h"
 
@@ -170,14 +168,13 @@ void lfsck_lmv_put(const struct lu_env *env, struct lfsck_lmv *llmv)
 
                        LASSERT(llmv->ll_lslr != NULL);
 
-                       OBD_FREE_LARGE(llmv->ll_lslr,
-                                      sizeof(*llmv->ll_lslr) *
-                                      llmv->ll_stripes_allocated);
+                       OBD_FREE_PTR_ARRAY_LARGE(llmv->ll_lslr,
+                                                llmv->ll_stripes_allocated);
                        OBD_FREE_PTR(llu);
                } else {
                        if (llmv->ll_lslr != NULL)
-                               OBD_FREE_LARGE(llmv->ll_lslr,
-                                       sizeof(*llmv->ll_lslr) *
+                               OBD_FREE_PTR_ARRAY_LARGE(
+                                       llmv->ll_lslr,
                                        llmv->ll_stripes_allocated);
 
                        OBD_FREE_PTR(llmv);
@@ -196,7 +193,7 @@ void lfsck_lmv_put(const struct lu_env *env, struct lfsck_lmv *llmv)
  * \param[in] del_lmv  true if need to drop the LMV EA
  *
  * \retval             positive number if nothing to be done
- * \retval             zero for succeed
+ * \retval             zero for success
  * \retval             negative error number on failure
  */
 static int lfsck_disable_master_lmv(const struct lu_env *env,
@@ -206,7 +203,7 @@ static int lfsck_disable_master_lmv(const struct lu_env *env,
        struct lfsck_thread_info        *info   = lfsck_env_info(env);
        struct lu_attr                  *la     = &info->lti_la;
        struct lfsck_instance           *lfsck  = com->lc_lfsck;
-       struct dt_device                *dev    = lfsck_obj2dt_dev(obj);
+       struct dt_device                *dev    = lfsck_obj2dev(obj);
        struct thandle                  *th     = NULL;
        int                              rc     = 0;
        ENTRY;
@@ -238,16 +235,16 @@ static int lfsck_disable_master_lmv(const struct lu_env *env,
                GOTO(unlock, rc = 0);
 
        if (del_lmv) {
-               rc = dt_xattr_del(env, obj, XATTR_NAME_LMV, th, BYPASS_CAPA);
+               rc = dt_xattr_del(env, obj, XATTR_NAME_LMV, th);
                if (rc != 0)
                        GOTO(unlock, rc);
        }
 
-       rc = dt_attr_get(env, obj, la, BYPASS_CAPA);
+       rc = dt_attr_get(env, obj, la);
        if (rc == 0 && !(la->la_flags & LUSTRE_IMMUTABLE_FL)) {
                la->la_valid = LA_FLAGS;
                la->la_flags |= LUSTRE_IMMUTABLE_FL;
-               rc = dt_attr_set(env, obj, la, th, BYPASS_CAPA);
+               rc = dt_attr_set(env, obj, la, th);
        }
 
        GOTO(unlock, rc);
@@ -282,36 +279,648 @@ static inline bool lfsck_is_valid_slave_lmv(struct lmv_mds_md_v1 *lmv)
               lmv_is_known_hash_type(lmv->lmv_hash_type);
 }
 
-int lfsck_read_stripe_lmv(const struct lu_env *env, struct dt_object *obj,
-                         struct lmv_mds_md_v1 *lmv)
+/**
+ * Remove the striped directory's master LMV EA and mark it as read-only.
+ *
+ * Take ldlm lock on the striped directory before calling the
+ * lfsck_disable_master_lmv().
+ *
+ * \param[in] env      pointer to the thread context
+ * \param[in] com      pointer to the lfsck component
+ * \param[in] obj      pointer to the striped directory to be handled
+ * \param[in] lnr      pointer to the namespace request that contains the
+ *                     striped directory to be handled and other information
+ *
+ * \retval             positive number if nothing to be done
+ * \retval             zero for success
+ * \retval             negative error number on failure
+ */
+static int lfsck_remove_lmv(const struct lu_env *env,
+                           struct lfsck_component *com,
+                           struct dt_object *obj,
+                           struct lfsck_namespace_req *lnr)
+{
+       struct lustre_handle     lh     = { 0 };
+       int                      rc;
+
+       lnr->lnr_lmv->ll_ignore = 1;
+       rc = lfsck_ibits_lock(env, com->lc_lfsck, obj, &lh,
+                             MDS_INODELOCK_UPDATE | MDS_INODELOCK_XATTR,
+                             LCK_EX);
+       if (rc == 0) {
+               rc = lfsck_disable_master_lmv(env, com, obj, true);
+               lfsck_ibits_unlock(&lh, LCK_EX);
+       }
+
+       return rc;
+}
+
+/**
+ * Remove the name entry from the striped directory's master MDT-object.
+ *
+ * \param[in] env      pointer to the thread context
+ * \param[in] com      pointer to the lfsck component
+ * \param[in] dir      pointer to the striped directory
+ * \param[in] fid      the shard's FID which name entry will be removed
+ * \param[in] index    the shard's index which name entry will be removed
+ *
+ * \retval             positive number for repaired successfully
+ * \retval             0 if nothing to be repaired
+ * \retval             negative error number on failure
+ */
+static int lfsck_remove_dirent(const struct lu_env *env,
+                              struct lfsck_component *com,
+                              struct dt_object *dir,
+                              const struct lu_fid *fid, __u32 index)
 {
-       struct dt_object *bottom;
+       struct lfsck_thread_info        *info = lfsck_env_info(env);
+       struct dt_object                *obj;
+       int                              rc;
+
+       snprintf(info->lti_tmpbuf2, sizeof(info->lti_tmpbuf2), DFID":%u",
+                PFID(fid), index);
+       obj = lfsck_object_find_bottom(env, com->lc_lfsck, fid);
+       if (IS_ERR(obj))
+               return PTR_ERR(obj);
+
+       rc = lfsck_namespace_repair_dirent(env, com, dir, obj,
+                                       info->lti_tmpbuf2, info->lti_tmpbuf2,
+                                       S_IFDIR, false, false);
+       lfsck_object_put(env, obj);
+       if (rc > 0) {
+               struct lfsck_namespace *ns = com->lc_file_ram;
+
+               ns->ln_dirent_repaired++;
+       }
+
+       return rc;
+}
+
+/**
+ * Remove old shard's name entry and refill the @lslr slot with new shard.
+ *
+ * Some old shard held the specified @lslr slot, but it is an invalid shard.
+ * This function will remove the bad shard's name entry, and refill the @lslr
+ * slot with the new shard.
+ *
+ * \param[in] env      pointer to the thread context
+ * \param[in] com      pointer to the lfsck component
+ * \param[in] dir      pointer to the striped directory to be handled
+ * \param[in] lslr     pointer to lfsck_disable_master_lmv slot which content
+ *                     will be replaced by the given information
+ * \param[in] lnr      contain the shard's FID to be used to fill the
+ *                     @lslr slot, it also records the known max filled index
+ *                     and the known max stripe count
+ * \param[in] lmv      contain the slave LMV EA to be used to fill the
+ *                     @lslr slot
+ * \param[in] index    the old shard's index in the striped directory
+ * \param[in] flags    the new shard's flags in the @lslr slot
+ *
+ * \retval             zero for success
+ * \retval             negative error number on failure
+ */
+static int lfsck_replace_lmv(const struct lu_env *env,
+                            struct lfsck_component *com,
+                            struct dt_object *dir,
+                            struct lfsck_slave_lmv_rec *lslr,
+                            struct lfsck_namespace_req *lnr,
+                            struct lmv_mds_md_v1 *lmv,
+                            __u32 index, __u32 flags)
+{
+       struct lfsck_lmv *llmv = lnr->lnr_lmv;
        int               rc;
 
-       /* Currently, we only store the LMV header on disk. It is the LOD's
-        * duty to iterate the master MDT-object's directory to compose the
-        * integrated LMV EA. But here, we only want to load the LMV header,
-        * so we need to bypass LOD to avoid unnecessary iteration in LOD. */
-       bottom = lu2dt(container_of0(obj->do_lu.lo_header->loh_layers.prev,
-                                    struct lu_object, lo_linkage));
-       if (unlikely(bottom == NULL))
-               return -ENOENT;
-
-       dt_read_lock(env, bottom, 0);
-       rc = dt_xattr_get(env, bottom, lfsck_buf_get(env, lmv, sizeof(*lmv)),
-                         XATTR_NAME_LMV, BYPASS_CAPA);
-       dt_read_unlock(env, bottom);
-       if (rc != sizeof(*lmv))
-               return rc > 0 ? -EINVAL : rc;
-
-       lfsck_lmv_header_le_to_cpu(lmv, lmv);
-       if ((lmv->lmv_magic == LMV_MAGIC &&
-            !(lmv->lmv_hash_type & LMV_HASH_FLAG_MIGRATION)) ||
-           (lmv->lmv_magic == LMV_MAGIC_STRIPE &&
-            !(lmv->lmv_hash_type & LMV_HASH_FLAG_DEAD)))
-               return 0;
-
-       return -ENODATA;
+       rc = lfsck_remove_dirent(env, com, dir,
+                                &lslr->lslr_fid, index);
+       if (rc < 0)
+               return rc;
+
+       lslr->lslr_fid = lnr->lnr_fid;
+       lslr->lslr_flags = flags;
+       lslr->lslr_stripe_count = lmv->lmv_stripe_count;
+       lslr->lslr_index = lmv->lmv_master_mdt_index;
+       lslr->lslr_hash_type = lmv->lmv_hash_type;
+       if (flags == LSLF_NONE) {
+               if (llmv->ll_hash_type == LMV_HASH_TYPE_UNKNOWN &&
+                   lmv_is_known_hash_type(lmv->lmv_hash_type))
+                       llmv->ll_hash_type = lmv->lmv_hash_type;
+
+               if (lslr->lslr_stripe_count <= LFSCK_LMV_MAX_STRIPES &&
+                   llmv->ll_max_stripe_count < lslr->lslr_stripe_count)
+                       llmv->ll_max_stripe_count = lslr->lslr_stripe_count;
+       }
+
+       return 0;
+}
+
+/**
+ * Record the slave LMV EA in the lfsck_lmv::ll_lslr.
+ *
+ * If the lfsck_lmv::ll_lslr slot corresponding to the given @shard_idx is free,
+ * then fill the slot with the given @lnr/@lmv/@flags directly (maybe need to
+ * extend the lfsck_lmv::ll_lslr buffer).
+ *
+ * If the lfsck_lmv::ll_lslr slot corresponding to the given @shard_idx is taken
+ * by other shard, then the LFSCK will try to resolve the conflict by checking
+ * the two conflict shards' flags, and try other possible slot (if one of them
+ * claims another possible @shard_idx).
+ *
+ * 1) If one of the two conflict shards can be recorded in another slot, then
+ *    it is OK, go ahead. Otherwise,
+ *
+ * 2) If one of them is dangling name entry, then remove (one of) the dangling
+ *    name entry (and replace related @lslr slot if needed). Otherwise,
+ *
+ * 3) If one of them has no slave LMV EA, then check whether the master LMV
+ *    EA has ever been lost and re-generated (LMV_HASH_FLAG_LOST_LMV in the
+ *    master LMV EA).
+ *
+ * 3.1) If yes, then it is possible that such object is not a real shard of
+ *     the striped directory, instead, it was created by someone after the
+ *     master LMV EA lost with the name that matches the shard naming rule.
+ *     Then the LFSCK will remove the master LMV EA and mark the striped
+ *     directory as read-only to allow those non-shard files to be visible
+ *     to client.
+ *
+ * 3.2) If no, then remove (one of) the object what has no slave LMV EA.
+ *
+ * 4) If all above efforts cannot work, then the LFSCK cannot know how to
+ *    recover the striped directory. To make the administrator can see the
+ *    conflicts, the LFSCK will remove the master LMV EA and mark the striped
+ *    directory as read-only.
+ *
+ * This function may be called recursively, to prevent overflow, we define
+ * LFSCK_REC_LMV_MAX_DEPTH to restrict the recursive call depth.
+ *
+ * \param[in] env      pointer to the thread context
+ * \param[in] com      pointer to the lfsck component
+ * \param[in] dir      pointer to the striped directory to be handled
+ * \param[in] lnr      contain the shard's FID to fill the @lslr slot,
+ *                     it also records the known max filled index and
+ *                     the known max stripe count
+ * \param[in] lmv      pointer to the slave LMV EA to be recorded
+ * \param[in] shard_idx        the shard's index used for locating the @lslr slot,
+ *                     it can be the index stored in the shard's name,
+ *                     it also can be the index stored in the slave LMV EA
+ *                     (for recursive case)
+ * \param[in] flags    the shard's flags to be recorded in the @lslr slot
+ *                     to indicate the shard status, such as whether has
+ *                     slave LMV EA, whether dangling name entry, whether
+ *                     the name entry and slave LMV EA unmatched, and ect
+ * \param[in] flags2   when be called recursively, the @flags2 tells the
+ *                     former conflict shard's flags in the @lslr slot.
+ * \param[in,out] depth        To prevent to be called recurisively too deep,
+ *                     we define the max depth can be called recursively
+ *                     (LFSCK_REC_LMV_MAX_DEPTH)
+ *
+ * \retval             zero for success
+ * \retval             "-ERANGE" for invalid @shard_idx
+ * \retval             "-EEXIST" for the required lslr slot has been
+ *                     occupied by other shard
+ * \retval             other negative error number on failure
+ */
+static int lfsck_record_lmv(const struct lu_env *env,
+                           struct lfsck_component *com,
+                           struct dt_object *dir,
+                           struct lfsck_namespace_req *lnr,
+                           struct lmv_mds_md_v1 *lmv, __u32 shard_idx,
+                           __u32 flags, __u32 flags2, __u32 *depth)
+{
+       struct lfsck_instance      *lfsck = com->lc_lfsck;
+       struct lfsck_lmv           *llmv  = lnr->lnr_lmv;
+       const struct lu_fid        *fid   = &lnr->lnr_fid;
+       struct lfsck_slave_lmv_rec *lslr;
+       struct lfsck_rec_lmv_save  *lrls;
+       int                         index = shard_idx;
+       int                         rc    = 0;
+       ENTRY;
+
+       CDEBUG(D_LFSCK, "%s: record slave LMV EA for the striped directory "
+              DFID": shard = "DFID", index = %u, flags = %u, flags2 = %u, "
+              "depth = %d\n", lfsck_lfsck2name(lfsck),
+              PFID(lfsck_dto2fid(dir)), PFID(fid),
+              index, flags, flags2, *depth);
+
+       if (index < 0 || index >= LFSCK_LMV_MAX_STRIPES)
+               RETURN(-ERANGE);
+
+       if (index >= llmv->ll_stripes_allocated) {
+               struct lfsck_slave_lmv_rec *new_lslr;
+               int new_stripes = index + 1;
+               size_t old_size = sizeof(*lslr) * llmv->ll_stripes_allocated;
+
+               OBD_ALLOC_PTR_ARRAY_LARGE(new_lslr, new_stripes);
+               if (new_lslr == NULL) {
+                       llmv->ll_failed = 1;
+
+                       RETURN(-ENOMEM);
+               }
+
+               memcpy(new_lslr, llmv->ll_lslr, old_size);
+               OBD_FREE_LARGE(llmv->ll_lslr, old_size);
+               llmv->ll_stripes_allocated = new_stripes;
+               llmv->ll_lslr = new_lslr;
+       }
+
+       lslr = llmv->ll_lslr + index;
+       if (unlikely(lu_fid_eq(&lslr->lslr_fid, fid)))
+               RETURN(0);
+
+       if (fid_is_zero(&lslr->lslr_fid)) {
+               lslr->lslr_fid = *fid;
+               lslr->lslr_stripe_count = lmv->lmv_stripe_count;
+               lslr->lslr_index = lmv->lmv_master_mdt_index;
+               lslr->lslr_hash_type = lmv->lmv_hash_type;
+               lslr->lslr_flags = flags;
+               llmv->ll_stripes_filled++;
+               if (flags == LSLF_NONE) {
+                       if (llmv->ll_hash_type == LMV_HASH_TYPE_UNKNOWN &&
+                           lmv_is_known_hash_type(lmv->lmv_hash_type))
+                               llmv->ll_hash_type = lmv->lmv_hash_type;
+
+                       if (lslr->lslr_stripe_count <= LFSCK_LMV_MAX_STRIPES &&
+                           llmv->ll_max_stripe_count < lslr->lslr_stripe_count)
+                               llmv->ll_max_stripe_count =
+                                                       lslr->lslr_stripe_count;
+               }
+
+               if (llmv->ll_max_filled_off < index)
+                       llmv->ll_max_filled_off = index;
+
+               RETURN(0);
+       }
+
+       (*depth)++;
+       if (flags != LSLF_BAD_INDEX2)
+               LASSERTF(*depth == 1, "depth = %d\n", *depth);
+
+       /* Handle conflict cases. */
+       switch (lslr->lslr_flags) {
+       case LSLF_NONE:
+       case LSLF_BAD_INDEX2:
+               /* The existing one is a normal valid object. */
+               switch (flags) {
+               case LSLF_NONE:
+                       /* The two 'valid' name entries claims the same
+                        * index, the LFSCK cannot distinguish which one
+                        * is correct. Then remove the master LMV EA to
+                        * make all shards to be visible to client, and
+                        * mark the master MDT-object as read-only. The
+                        * administrator can handle the conflict with
+                        * more human knowledge. */
+                       rc = lfsck_remove_lmv(env, com, dir, lnr);
+                       break;
+               case LSLF_BAD_INDEX2:
+                       GOTO(out, rc = -EEXIST);
+               case LSLF_NO_LMVEA:
+
+no_lmvea:
+                       if (llmv->ll_lmv.lmv_hash_type &
+                           LMV_HASH_FLAG_LOST_LMV) {
+                               /* If the master LMV EA was re-generated
+                                * by the former LFSCK reparation, and
+                                * before such reparation, someone has
+                                * created the conflict object, but the
+                                * LFSCK did not detect such conflict,
+                                * then we have to remove the master
+                                * LMV EA and mark the master MDT-object
+                                * as read-only. The administrator can
+                                * handle the conflict with more human
+                                * knowledge. */
+                               rc = lfsck_remove_lmv(env, com, dir, lnr);
+                       } else {
+                               /* Otherwise, remove the current name entry,
+                                * and add its FID in the LFSCK tracing file
+                                * for further processing. */
+                               rc = lfsck_namespace_trace_update(env, com, fid,
+                                               LNTF_CHECK_PARENT, true);
+                               if (rc == 0)
+                                       rc = lfsck_remove_dirent(env, com, dir,
+                                                                fid, index);
+                       }
+
+                       break;
+               case LSLF_DANGLING:
+                       /* Remove the current dangling name entry. */
+                       rc = lfsck_remove_dirent(env, com, dir, fid, index);
+                       break;
+               case LSLF_BAD_INDEX1:
+                       index = lmv->lmv_master_mdt_index;
+                       lmv->lmv_master_mdt_index = shard_idx;
+                       /* The name entry claims an index that is conflict
+                        * with a valid existing name entry, then try the
+                        * index in the lmv recursively. */
+                       rc = lfsck_record_lmv(env, com, dir, lnr, lmv, index,
+                               LSLF_BAD_INDEX2, lslr->lslr_flags, depth);
+                       lmv->lmv_master_mdt_index = index;
+                       if (rc == -ERANGE || rc == -EEXIST)
+                               /* The index in the lmv is invalid or
+                                * also conflict with other. Then we do
+                                * not know how to resolve the conflict.
+                                * We will handle it as handle the case
+                                * of 'LSLF_NONE' vs 'LSLF_NONE'. */
+                               rc = lfsck_remove_lmv(env, com, dir, lnr);
+
+                       break;
+               default:
+                       break;
+               }
+
+               break;
+       case LSLF_NO_LMVEA:
+               /* The existing one has no slave LMV EA. */
+               switch (flags) {
+               case LSLF_NONE:
+
+none:
+                       if (llmv->ll_lmv.lmv_hash_type &
+                           LMV_HASH_FLAG_LOST_LMV) {
+                               /* If the master LMV EA was re-generated
+                                * by the former LFSCK reparation, and
+                                * before such reparation, someone has
+                                * created the conflict object, but the
+                                * LFSCK did not detect such conflict,
+                                * then we have to remove the master
+                                * LMV EA and mark the master MDT-object
+                                * as read-only. The administrator can
+                                * handle the conflict with more human
+                                * knowledge. */
+                               rc = lfsck_remove_lmv(env, com, dir, lnr);
+                       } else {
+                               lrls = &lfsck->li_rec_lmv_save[*depth - 1];
+                               lrls->lrls_fid = lslr->lslr_fid;
+                               /* Otherwise, remove the existing name entry,
+                                * and add its FID in the LFSCK tracing file
+                                * for further processing. Refill the slot
+                                * with current slave LMV EA. */
+                               rc = lfsck_namespace_trace_update(env,
+                                               com, &lrls->lrls_fid,
+                                               LNTF_CHECK_PARENT, true);
+                               if (rc == 0)
+                                       rc = lfsck_replace_lmv(env, com, dir,
+                                               lslr, lnr, lmv, index, flags);
+                       }
+
+                       break;
+               case LSLF_BAD_INDEX2:
+                       if (flags2 >= lslr->lslr_flags)
+                               GOTO(out, rc = -EEXIST);
+
+                       goto none;
+               case LSLF_NO_LMVEA:
+                       goto no_lmvea;
+               case LSLF_DANGLING:
+                       /* Remove the current dangling name entry. */
+                       rc = lfsck_remove_dirent(env, com, dir, fid, index);
+                       break;
+               case LSLF_BAD_INDEX1:
+                       index = lmv->lmv_master_mdt_index;
+                       lmv->lmv_master_mdt_index = shard_idx;
+                       /* The name entry claims an index that is conflict
+                        * with a valid existing name entry, then try the
+                        * index in the lmv recursively. */
+                       rc = lfsck_record_lmv(env, com, dir, lnr, lmv, index,
+                               LSLF_BAD_INDEX2, lslr->lslr_flags, depth);
+                       lmv->lmv_master_mdt_index = index;
+                       if (rc == -ERANGE || rc == -EEXIST) {
+                               index = shard_idx;
+                               goto no_lmvea;
+                       }
+
+                       break;
+               default:
+                       break;
+               }
+
+               break;
+       case LSLF_DANGLING:
+               /* The existing one is a dangling name entry. */
+               switch (flags) {
+               case LSLF_NONE:
+               case LSLF_BAD_INDEX2:
+               case LSLF_NO_LMVEA:
+                       /* Remove the existing dangling name entry.
+                        * Refill the lslr slot with the given LMV. */
+                       rc = lfsck_replace_lmv(env, com, dir, lslr, lnr,
+                                              lmv, index, flags);
+                       break;
+               case LSLF_DANGLING:
+                       /* Two dangling name entries conflict,
+                        * remove the current one. */
+                       rc = lfsck_remove_dirent(env, com, dir, fid, index);
+                       break;
+               case LSLF_BAD_INDEX1:
+                       index = lmv->lmv_master_mdt_index;
+                       lmv->lmv_master_mdt_index = shard_idx;
+                       /* The name entry claims an index that is conflict
+                        * with a valid existing name entry, then try the
+                        * index in the lmv recursively. */
+                       rc = lfsck_record_lmv(env, com, dir, lnr, lmv, index,
+                               LSLF_BAD_INDEX2, lslr->lslr_flags, depth);
+                       lmv->lmv_master_mdt_index = index;
+                       if (rc == -ERANGE || rc == -EEXIST)
+                               /* If the index in the lmv is invalid or
+                                * also conflict with other, then remove
+                                * the existing dangling name entry.
+                                * Refill the lslr slot with the given LMV. */
+                               rc = lfsck_replace_lmv(env, com, dir, lslr, lnr,
+                                                      lmv, shard_idx, flags);
+
+                       break;
+               default:
+                       break;
+               }
+
+               break;
+       case LSLF_BAD_INDEX1: {
+               if (*depth >= LFSCK_REC_LMV_MAX_DEPTH)
+                       goto conflict;
+
+               lrls = &lfsck->li_rec_lmv_save[*depth - 1];
+               lrls->lrls_fid = lnr->lnr_fid;
+               lrls->lrls_lmv = *lmv;
+
+               lnr->lnr_fid = lslr->lslr_fid;
+               lmv->lmv_master_mdt_index = index;
+               lmv->lmv_stripe_count = lslr->lslr_stripe_count;
+               lmv->lmv_hash_type = lslr->lslr_hash_type;
+               index = lslr->lslr_index;
+
+               /* The existing one has another possible slot,
+                * try it recursively. */
+               rc = lfsck_record_lmv(env, com, dir, lnr, lmv, index,
+                                     LSLF_BAD_INDEX2, flags, depth);
+               *lmv = lrls->lrls_lmv;
+               lnr->lnr_fid = lrls->lrls_fid;
+               index = shard_idx;
+               if (rc != 0) {
+                       if (rc == -ERANGE || rc == -EEXIST)
+                               goto conflict;
+
+                       break;
+               }
+
+               lslr->lslr_fid = *fid;
+               lslr->lslr_flags = flags;
+               lslr->lslr_stripe_count = lmv->lmv_stripe_count;
+               lslr->lslr_index = lmv->lmv_master_mdt_index;
+               lslr->lslr_hash_type = lmv->lmv_hash_type;
+               if (flags == LSLF_NONE) {
+                       if (llmv->ll_hash_type == LMV_HASH_TYPE_UNKNOWN &&
+                           lmv_is_known_hash_type(lmv->lmv_hash_type))
+                               llmv->ll_hash_type = lmv->lmv_hash_type;
+
+                       if (lslr->lslr_stripe_count <= LFSCK_LMV_MAX_STRIPES &&
+                           llmv->ll_max_stripe_count < lslr->lslr_stripe_count)
+                               llmv->ll_max_stripe_count =
+                                                       lslr->lslr_stripe_count;
+               }
+
+               break;
+
+conflict:
+               switch (flags) {
+               case LSLF_NONE:
+                       /* The two 'valid' name entries claims the same
+                        * index, the LFSCK cannot distinguish which one
+                        * is correct. Then remove the master LMV EA to
+                        * make all shards to be visible to client, and
+                        * mark the master MDT-object as read-only. The
+                        * administrator can handle the conflict with
+                        * more human knowledge. */
+                       rc = lfsck_remove_lmv(env, com, dir, lnr);
+                       break;
+               case LSLF_BAD_INDEX2:
+                       GOTO(out, rc = -EEXIST);
+               case LSLF_NO_LMVEA:
+                       goto no_lmvea;
+               case LSLF_DANGLING:
+                       /* Remove the current dangling name entry. */
+                       rc = lfsck_remove_dirent(env, com, dir, fid, index);
+                       break;
+               case LSLF_BAD_INDEX1:
+                       index = lmv->lmv_master_mdt_index;
+                       lmv->lmv_master_mdt_index = shard_idx;
+                       /* The name entry claims an index that is conflict
+                        * with a valid existing name entry, then try the
+                        * index in the lmv recursively. */
+                       rc = lfsck_record_lmv(env, com, dir, lnr, lmv, index,
+                               LSLF_BAD_INDEX2, lslr->lslr_flags, depth);
+                       lmv->lmv_master_mdt_index = index;
+                       if (rc == -ERANGE || rc == -EEXIST)
+                               /* The index in the lmv is invalid or
+                                * also conflict with other. Then we do
+                                * not know how to resolve the conflict.
+                                * We will handle it as handle the case
+                                * of 'LSLF_NONE' vs 'LSLF_NONE'. */
+                               rc = lfsck_remove_lmv(env, com, dir, lnr);
+
+                       break;
+               }
+
+               break;
+       }
+       default:
+               break;
+       }
+
+       if (rc < 0)
+               llmv->ll_failed = 1;
+
+       GOTO(out, rc);
+
+out:
+       (*depth)--;
+
+       return rc > 0 ? 0 : rc;
+}
+
+/**
+ * Read LMV from bottom object, so it doesn't contain stripe FIDs.
+ *
+ * TODO: test migrating/foreign directory lfsck
+ *
+ * \param[in] env      thread env
+ * \param[in] lfsck    lfsck instance
+ * \param[in] obj      dt object
+ * \param[out] lmv     LMV data pointer
+ *
+ * \retval             0 on success
+ * \retval             -ENODATA on no LMV, corrupt LMV, dir is dead or foreign
+ *                     -ev on other failures
+ */
+int lfsck_read_stripe_lmv(const struct lu_env *env,
+                         struct lfsck_instance *lfsck,
+                         struct dt_object *obj,
+                         struct lmv_mds_md_v1 *lmv)
+{
+       struct lfsck_thread_info *info = lfsck_env_info(env);
+       struct lu_buf *buf = &info->lti_buf;
+       struct lmv_foreign_md *lfm;
+       int rc;
+
+       /* use bottom object to avoid reading in shard FIDs */
+       obj = lfsck_object_find_bottom(env, lfsck, lu_object_fid(&obj->do_lu));
+       if (IS_ERR(obj))
+               return PTR_ERR(obj);
+
+       dt_read_lock(env, obj, 0);
+       buf->lb_buf = lmv;
+       buf->lb_len = sizeof(*lmv);
+       rc = dt_xattr_get(env, obj, buf, XATTR_NAME_LMV);
+       if (unlikely(rc == -ERANGE)) {
+               buf = &info->lti_big_buf;
+               /* this may be a foreign LMV */
+               rc = dt_xattr_get(env, obj, &LU_BUF_NULL, XATTR_NAME_LMV);
+               if (rc > sizeof(*lmv)) {
+                       int rc1;
+
+                       lu_buf_check_and_alloc(buf, rc);
+                       rc1 = dt_xattr_get(env, obj, buf, XATTR_NAME_LMV);
+                       if (rc != rc1)
+                               rc = -ENODATA;
+               } else {
+                       rc = -ENODATA;
+               }
+       }
+       dt_read_unlock(env, obj);
+
+       lfsck_object_put(env, obj);
+
+       if (rc > offsetof(typeof(*lfm), lfm_value) &&
+           *((__u32 *)buf->lb_buf) == LMV_MAGIC_FOREIGN) {
+               __u32 value_len;
+
+               lfm = buf->lb_buf;
+               value_len = le32_to_cpu(lfm->lfm_length);
+               CDEBUG(D_INFO,
+                      "foreign LMV EA, magic %x, len %u, type %x, flags %x, for dir "DFID"\n",
+                      le32_to_cpu(lfm->lfm_magic), value_len,
+                      le32_to_cpu(lfm->lfm_type), le32_to_cpu(lfm->lfm_flags),
+                      PFID(lfsck_dto2fid(obj)));
+
+               if (rc != value_len + offsetof(typeof(*lfm), lfm_value))
+                       CDEBUG(D_LFSCK,
+                              "foreign LMV EA internal size %u does not match EA full size %d for dir "DFID"\n",
+                              value_len, rc, PFID(lfsck_dto2fid(obj)));
+
+               /* no further usage/decode of foreign LMV outside */
+               return -ENODATA;
+       }
+
+       if (rc == sizeof(*lmv)) {
+               rc = 0;
+               lfsck_lmv_header_le_to_cpu(lmv, lmv);
+               /* if LMV is corrupt, return -ENODATA */
+               if (lmv->lmv_magic != LMV_MAGIC_V1 &&
+                   lmv->lmv_magic != LMV_MAGIC_STRIPE) 
+                       rc = -ENODATA;
+       } else if (rc >= 0) {
+               /* LMV is corrupt */
+               rc = -ENODATA;
+       }
+
+       return rc;
 }
 
 /**
@@ -361,24 +970,30 @@ int lfsck_shard_name_to_index(const struct lu_env *env, const char *name,
        return idx;
 }
 
+static inline bool lfsck_name_hash_match(struct lmv_mds_md_v1 *lmv,
+                                        const char *name, int namelen)
+{
+       int idx;
+
+       idx = lmv_name_to_stripe_index_old(lmv, name, namelen);
+       if (idx == lmv->lmv_master_mdt_index)
+               return true;
+
+       if (!lmv_hash_is_layout_changing(lmv->lmv_hash_type))
+               return false;
+
+       idx = lmv_name_to_stripe_index(lmv, name, namelen);
+       return (idx == lmv->lmv_master_mdt_index);
+}
+
 bool lfsck_is_valid_slave_name_entry(const struct lu_env *env,
                                     struct lfsck_lmv *llmv,
                                     const char *name, int namelen)
 {
-       struct lmv_mds_md_v1    *lmv;
-       int                      idx;
-
        if (llmv == NULL || !llmv->ll_lmv_slave || !llmv->ll_lmv_verified)
                return true;
 
-       lmv = &llmv->ll_lmv;
-       idx = lmv_name_to_stripe_index(lmv->lmv_hash_type,
-                                      lmv->lmv_stripe_count,
-                                      name, namelen);
-       if (unlikely(idx != lmv->lmv_master_mdt_index))
-               return false;
-
-       return true;
+       return lfsck_name_hash_match(&llmv->ll_lmv, name, namelen);
 }
 
 /**
@@ -400,15 +1015,15 @@ bool lfsck_is_valid_slave_name_entry(const struct lu_env *env,
  * \retval             negative error number on failure
  */
 int lfsck_namespace_check_name(const struct lu_env *env,
+                              struct lfsck_instance *lfsck,
                               struct dt_object *parent,
                               struct dt_object *child,
                               const struct lu_name *cname)
 {
-       struct lmv_mds_md_v1    *lmv = &lfsck_env_info(env)->lti_lmv;
-       int                      idx;
-       int                      rc;
+       struct lmv_mds_md_v1 *lmv = &lfsck_env_info(env)->lti_lmv;
+       int rc;
 
-       rc = lfsck_read_stripe_lmv(env, parent, lmv);
+       rc = lfsck_read_stripe_lmv(env, lfsck, parent, lmv);
        if (rc != 0)
                RETURN(rc == -ENODATA ? 0 : rc);
 
@@ -416,11 +1031,8 @@ int lfsck_namespace_check_name(const struct lu_env *env,
                if (!lfsck_is_valid_slave_lmv(lmv))
                        return 0;
 
-               idx = lmv_name_to_stripe_index(lmv->lmv_hash_type,
-                                              lmv->lmv_stripe_count,
-                                              cname->ln_name,
-                                              cname->ln_namelen);
-               if (unlikely(idx != lmv->lmv_master_mdt_index))
+               if (!lfsck_name_hash_match(lmv, cname->ln_name,
+                                          cname->ln_namelen))
                        return 1;
        } else if (lfsck_shard_name_to_index(env, cname->ln_name,
                        cname->ln_namelen, lfsck_object_type(child),
@@ -453,7 +1065,7 @@ int lfsck_namespace_update_lmv(const struct lu_env *env,
        struct lmv_mds_md_v1            *lmv4   = &info->lti_lmv4;
        struct lu_buf                   *buf    = &info->lti_buf;
        struct lfsck_instance           *lfsck  = com->lc_lfsck;
-       struct dt_device                *dev    = lfsck_obj2dt_dev(obj);
+       struct dt_device                *dev    = lfsck_obj2dev(obj);
        struct thandle                  *th     = NULL;
        struct lustre_handle             lh     = { 0 };
        int                              rc     = 0;
@@ -497,7 +1109,7 @@ int lfsck_namespace_update_lmv(const struct lu_env *env,
        if (lfsck->li_bookmark_ram.lb_param & LPF_DRYRUN)
                GOTO(unlock, rc = 0);
 
-       rc = dt_xattr_set(env, obj, buf, XATTR_NAME_LMV, 0, th, BYPASS_CAPA);
+       rc = dt_xattr_set(env, obj, buf, XATTR_NAME_LMV, 0, th);
 
        GOTO(unlock, rc);
 
@@ -521,13 +1133,14 @@ log:
 }
 
 /**
- * Check whether there are non-shard objects under the striped directory.
+ * Check whether allow to re-genereate the lost master LMV EA.
  *
  * If the master MDT-object of the striped directory lost its master LMV EA,
  * then before the LFSCK repaired the striped directory, some ones may have
- * created some non-shard objects under the master MDT-object. If such case
- * happend, then the LFSCK cannot re-generate the lost master LMV EA to keep
- * those non-shard objects to be visible to client.
+ * created some objects (that are not normal shards of the striped directory)
+ * under the master MDT-object. If such case happend, then the LFSCK cannot
+ * re-generate the lost master LMV EA to keep those objects to be visible to
+ * client.
  *
  * \param[in] env      pointer to the thread context
  * \param[in] com      pointer to the lfsck component
@@ -539,10 +1152,11 @@ log:
  * \retval             zero if allow to re-generate LMV EA
  * \retval             negative error number on failure
  */
-static int lfsck_allow_set_master_lmv(const struct lu_env *env,
-                                     struct lfsck_component *com,
-                                     struct dt_object *obj,
-                                     const struct lu_fid *cfid, __u32 cidx)
+static int lfsck_allow_regenerate_master_lmv(const struct lu_env *env,
+                                            struct lfsck_component *com,
+                                            struct dt_object *obj,
+                                            const struct lu_fid *cfid,
+                                            __u32 cidx)
 {
        struct lfsck_thread_info        *info   = lfsck_env_info(env);
        struct lu_fid                   *tfid   = &info->lti_fid3;
@@ -564,7 +1178,7 @@ static int lfsck_allow_set_master_lmv(const struct lu_env *env,
        snprintf(info->lti_tmpbuf, sizeof(info->lti_tmpbuf), DFID":%u",
                 PFID(cfid), cidx);
        rc = dt_lookup(env, obj, (struct dt_rec *)tfid,
-                      (const struct dt_key *)info->lti_tmpbuf, BYPASS_CAPA);
+                      (const struct dt_key *)info->lti_tmpbuf);
        if (rc != 0)
                RETURN(rc);
 
@@ -573,7 +1187,7 @@ static int lfsck_allow_set_master_lmv(const struct lu_env *env,
 
        args = lfsck->li_args_dir & ~(LUDA_VERIFY | LUDA_VERIFY_DRYRUN);
        iops = &obj->do_index_ops->dio_it;
-       di = iops->init(env, obj, args, BYPASS_CAPA);
+       di = iops->init(env, obj, args);
        if (IS_ERR(di))
                RETURN(PTR_ERR(di));
 
@@ -643,7 +1257,7 @@ out:
  * \param[in] index    the MDT index on which the LFSCK instance to be notified
  *
  * \retval             positive number if nothing to be done
- * \retval             zero for succeed
+ * \retval             zero for success
  * \retval             negative error number on failure
  */
 static int lfsck_namespace_notify_lmv_remote(const struct lu_env *env,
@@ -679,7 +1293,7 @@ static int lfsck_namespace_notify_lmv_remote(const struct lu_env *env,
        lr = req_capsule_client_get(&req->rq_pill, &RMF_LFSCK_REQUEST);
        memset(lr, 0, sizeof(*lr));
        lr->lr_event = event;
-       lr->lr_index = lfsck_dev_idx(lfsck->li_bottom);
+       lr->lr_index = lfsck_dev_idx(lfsck);
        lr->lr_active = LFSCK_TYPE_NAMESPACE;
        lr->lr_fid = *fid;
        lr->lr_flags = flags;
@@ -710,7 +1324,7 @@ out:
  * \param[in] obj      pointer to the striped directory to be rescanned
  *
  * \retval             positive number if nothing to be done
- * \retval             zero for succeed
+ * \retval             zero for success
  * \retval             negative error number on failure
  */
 int lfsck_namespace_notify_lmv_master_local(const struct lu_env *env,
@@ -730,7 +1344,7 @@ int lfsck_namespace_notify_lmv_master_local(const struct lu_env *env,
        if (lfsck->li_bookmark_ram.lb_param & LPF_DRYRUN)
                RETURN(0);
 
-       rc = lfsck_read_stripe_lmv(env, obj, lmv4);
+       rc = lfsck_read_stripe_lmv(env, lfsck, obj, lmv4);
        if (rc != 0)
                RETURN(rc);
 
@@ -745,7 +1359,7 @@ int lfsck_namespace_notify_lmv_master_local(const struct lu_env *env,
        else
                count = lmv4->lmv_stripe_count;
 
-       OBD_ALLOC_LARGE(lslr, sizeof(struct lfsck_slave_lmv_rec) * count);
+       OBD_ALLOC_PTR_ARRAY_LARGE(lslr, count);
        if (lslr == NULL) {
                OBD_FREE_PTR(llu);
 
@@ -772,6 +1386,7 @@ int lfsck_namespace_notify_lmv_master_local(const struct lu_env *env,
                lfsck_lmv_put(env, llmv);
        } else {
                ns->ln_striped_dirs_repaired++;
+               llmv->ll_counted = 1;
                spin_lock(&lfsck->li_lock);
                list_add_tail(&llu->llu_link, &lfsck->li_list_lmv);
                spin_unlock(&lfsck->li_lock);
@@ -798,61 +1413,47 @@ int lfsck_namespace_notify_lmv_master_local(const struct lu_env *env,
  *
  * \param[in] env      pointer to the thread context
  * \param[in] com      pointer to the lfsck component
- * \param[in] dir      pointer to the object on which the LMV EA will be set
+ * \param[in] obj      pointer to the object on which the LMV EA will be set
  * \param[in] lmv      pointer to the buffer holding the new LMV EA
  * \param[in] cfid     the shard's FID used for verification
  * \param[in] cidx     the shard's index used for verification
  * \param[in] flags    to indicate which element(s) in the LMV EA will be set
  *
  * \retval             positive number if nothing to be done
- * \retval             zero for succeed
+ * \retval             zero for success
  * \retval             negative error number on failure
  */
 static int lfsck_namespace_set_lmv_master(const struct lu_env *env,
                                          struct lfsck_component *com,
-                                         struct dt_object *dir,
+                                         struct dt_object *obj,
                                          struct lmv_mds_md_v1 *lmv,
                                          const struct lu_fid *cfid,
                                          __u32 cidx, __u32 flags)
 {
        struct lfsck_thread_info        *info   = lfsck_env_info(env);
        struct lmv_mds_md_v1            *lmv3   = &info->lti_lmv3;
+       struct lu_seq_range             *range  = &info->lti_range;
        struct lfsck_instance           *lfsck  = com->lc_lfsck;
-       struct dt_object                *obj;
+       struct seq_server_site          *ss     = lfsck_dev_site(lfsck);
        struct lustre_handle             lh     = { 0 };
        int                              pidx   = -1;
        int                              rc     = 0;
        ENTRY;
 
-       /* Find the bottom object to bypass LOD when set LMV EA. */
-       obj = lu2dt(container_of0(dir->do_lu.lo_header->loh_layers.prev,
-                                 struct lu_object, lo_linkage));
-       if (unlikely(obj == NULL))
-               RETURN(-ENOENT);
-
-       if (dt_object_remote(obj)) {
-               struct lu_seq_range     *range  = &info->lti_range;
-               struct seq_server_site  *ss     =
-                       lu_site2seq(lfsck->li_bottom->dd_lu_dev.ld_site);
-
-               fld_range_set_mdt(range);
-               rc = fld_server_lookup(env, ss->ss_server_fld,
-                                      fid_seq(lfsck_dto2fid(obj)), range);
-               if (rc != 0)
-                       GOTO(log, rc);
-
-               pidx = range->lsr_index;
-       } else {
-               pidx = lfsck_dev_idx(lfsck->li_bottom);
-       }
+       fld_range_set_mdt(range);
+       rc = fld_server_lookup(env, ss->ss_server_fld,
+                              fid_seq(lfsck_dto2fid(obj)), range);
+       if (rc != 0)
+               GOTO(log, rc);
 
+       pidx = range->lsr_index;
        rc = lfsck_ibits_lock(env, lfsck, obj, &lh,
                              MDS_INODELOCK_UPDATE | MDS_INODELOCK_XATTR,
                              LCK_EX);
        if (rc != 0)
                GOTO(log, rc);
 
-       rc = lfsck_read_stripe_lmv(env, obj, lmv3);
+       rc = lfsck_read_stripe_lmv(env, lfsck, obj, lmv3);
        if (rc == -ENODATA) {
                if (!(flags & LEF_SET_LMV_ALL))
                        GOTO(log, rc);
@@ -870,9 +1471,11 @@ static int lfsck_namespace_set_lmv_master(const struct lu_env *env,
 
        lmv3->lmv_magic = LMV_MAGIC;
        lmv3->lmv_master_mdt_index = pidx;
+       lmv3->lmv_layout_version++;
 
        if (flags & LEF_SET_LMV_ALL) {
-               rc = lfsck_allow_set_master_lmv(env, com, obj, cfid, cidx);
+               rc = lfsck_allow_regenerate_master_lmv(env, com, obj,
+                                                      cfid, cidx);
                if (rc > 0) {
                        rc = lfsck_disable_master_lmv(env, com, obj, false);
 
@@ -932,7 +1535,7 @@ log:
  * \param[in] name     the name of the bad name hash
  *
  * \retval             positive number if nothing to be done
- * \retval             zero for succeed
+ * \retval             zero for success
  * \retval             negative error number on failure
  */
 int lfsck_namespace_repair_bad_name_hash(const struct lu_env *env,
@@ -949,8 +1552,7 @@ int lfsck_namespace_repair_bad_name_hash(const struct lu_env *env,
        int                              rc     = 0;
        ENTRY;
 
-       rc = dt_lookup(env, shard, (struct dt_rec *)pfid,
-                      (const struct dt_key *)dotdot, BYPASS_CAPA);
+       rc = dt_lookup_dir(env, shard, dotdot, pfid);
        if (rc != 0 || !fid_is_sane(pfid))
                GOTO(log, rc);
 
@@ -958,6 +1560,12 @@ int lfsck_namespace_repair_bad_name_hash(const struct lu_env *env,
        if (IS_ERR(parent))
                GOTO(log, rc = PTR_ERR(parent));
 
+       if (unlikely(!dt_object_exists(parent)))
+               /* The parent object was previously accessed when verifying
+                * the slave LMV EA.  If this condition is true it is because
+                * the striped directory is being removed. */
+               GOTO(log, rc = 1);
+
        *lmv2 = llmv->ll_lmv;
        lmv2->lmv_hash_type = LMV_HASH_TYPE_UNKNOWN | LMV_HASH_FLAG_BAD_TYPE;
        rc = lfsck_namespace_set_lmv_master(env, com, parent, lmv2,
@@ -971,7 +1579,7 @@ log:
        CDEBUG(D_LFSCK, "%s: namespace LFSCK assistant found bad name hash "
               "on the MDT %x, parent "DFID", name %s, shard_%x "DFID
               ": rc = %d\n",
-              lfsck_lfsck2name(lfsck), lfsck_dev_idx(lfsck->li_bottom),
+              lfsck_lfsck2name(lfsck), lfsck_dev_idx(lfsck),
               PFID(pfid), name, llmv->ll_lmv.lmv_master_mdt_index,
               PFID(lfsck_dto2fid(shard)), rc);
 
@@ -1022,7 +1630,7 @@ int lfsck_namespace_scan_shard(const struct lu_env *env,
        __u16                            type;
        ENTRY;
 
-       rc = lfsck_read_stripe_lmv(env, child, lmv);
+       rc = lfsck_read_stripe_lmv(env, lfsck, child, lmv);
        if (rc != 0)
                RETURN(rc == -ENODATA ? 1 : rc);
 
@@ -1043,7 +1651,7 @@ int lfsck_namespace_scan_shard(const struct lu_env *env,
 
        args = lfsck->li_args_dir & ~(LUDA_VERIFY | LUDA_VERIFY_DRYRUN);
        iops = &child->do_index_ops->dio_it;
-       di = iops->init(env, child, args, BYPASS_CAPA);
+       di = iops->init(env, child, args);
        if (IS_ERR(di))
                GOTO(out, rc = PTR_ERR(di));
 
@@ -1054,19 +1662,9 @@ int lfsck_namespace_scan_shard(const struct lu_env *env,
                rc = 0;
 
        while (rc == 0) {
-               if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_DELAY3) &&
-                   cfs_fail_val > 0) {
-                       struct l_wait_info lwi;
-
-                       lwi = LWI_TIMEOUT(cfs_time_seconds(cfs_fail_val),
-                                         NULL, NULL);
-                       l_wait_event(thread->t_ctl_waitq,
-                                    !thread_is_running(thread),
-                                    &lwi);
-
-                       if (unlikely(!thread_is_running(thread)))
-                               GOTO(out, rc = 0);
-               }
+               if (CFS_FAIL_TIMEOUT(OBD_FAIL_LFSCK_DELAY3, cfs_fail_val) &&
+                   unlikely(!thread_is_running(thread)))
+                       GOTO(out, rc = 0);
 
                rc = iops->rec(env, di, (struct dt_rec *)ent, args);
                if (rc == 0)
@@ -1088,7 +1686,7 @@ int lfsck_namespace_scan_shard(const struct lu_env *env,
                        ns->ln_flags |= LF_INCONSISTENT;
                        rc = lfsck_namespace_repair_bad_name_hash(env, com,
                                                child, llmv, ent->lde_name);
-                       if (rc >= 0)
+                       if (rc == 0)
                                ns->ln_name_hash_repaired++;
                }
 
@@ -1134,7 +1732,8 @@ out:
  * \param[in] obj      pointer to the object which LMV EA will be checked
  * \param[in] llmv     pointer to buffer holding the slave LMV EA
  *
- * \retval             zero for succeed
+ * \retval             positive number if nothing to be done
+ * \retval             zero for success
  * \retval             negative error number on failure
  */
 int lfsck_namespace_verify_stripe_slave(const struct lu_env *env,
@@ -1146,8 +1745,8 @@ int lfsck_namespace_verify_stripe_slave(const struct lu_env *env,
        char                            *name   = info->lti_key;
        char                            *name2;
        struct lu_fid                   *pfid   = &info->lti_fid3;
-       struct lu_fid                   *tfid   = &info->lti_fid4;
        const struct lu_fid             *cfid   = lfsck_dto2fid(obj);
+       struct lu_fid                    tfid;
        struct lfsck_instance           *lfsck  = com->lc_lfsck;
        struct lmv_mds_md_v1            *clmv   = &llmv->ll_lmv;
        struct lmv_mds_md_v1            *plmv   = &info->lti_lmv;
@@ -1162,8 +1761,7 @@ int lfsck_namespace_verify_stripe_slave(const struct lu_env *env,
                GOTO(out, rc);
        }
 
-       rc = dt_lookup(env, obj, (struct dt_rec *)pfid,
-                      (const struct dt_key *)dotdot, BYPASS_CAPA);
+       rc = dt_lookup_dir(env, obj, dotdot, pfid);
        if (rc != 0 || !fid_is_sane(pfid)) {
                rc = lfsck_namespace_trace_update(env, com, cfid,
                                        LNTF_UNCERTAIN_LMV, true);
@@ -1171,7 +1769,9 @@ int lfsck_namespace_verify_stripe_slave(const struct lu_env *env,
                GOTO(out, rc);
        }
 
-       parent = lfsck_object_find(env, lfsck, pfid);
+       CFS_FAIL_TIMEOUT(OBD_FAIL_LFSCK_ENGINE_DELAY, cfs_fail_val);
+
+       parent = lfsck_object_find_bottom(env, lfsck, pfid);
        if (IS_ERR(parent)) {
                rc = lfsck_namespace_trace_update(env, com, cfid,
                                        LNTF_UNCERTAIN_LMV, true);
@@ -1179,7 +1779,13 @@ int lfsck_namespace_verify_stripe_slave(const struct lu_env *env,
                GOTO(out, rc);
        }
 
-       rc = lfsck_read_stripe_lmv(env, parent, plmv);
+       if (unlikely(!dt_object_exists(parent)))
+               GOTO(out, rc = 1);
+
+       if (unlikely(!dt_try_as_dir(env, parent)))
+               GOTO(out, rc = -ENOTDIR);
+
+       rc = lfsck_read_stripe_lmv(env, lfsck, parent, plmv);
        if (rc != 0) {
                int rc1;
 
@@ -1228,16 +1834,15 @@ int lfsck_namespace_verify_stripe_slave(const struct lu_env *env,
                 PFID(cfid), clmv->lmv_master_mdt_index);
        name2 = info->lti_tmpbuf2;
 
-       rc = lfsck_links_get_first(env, obj, name, tfid);
-       if (rc == 0 && strcmp(name, name2) == 0 && lu_fid_eq(pfid, tfid)) {
+       rc = lfsck_links_get_first(env, obj, name, &tfid);
+       if (rc == 0 && strcmp(name, name2) == 0 && lu_fid_eq(pfid, &tfid)) {
                llmv->ll_lmv_verified = 1;
 
                GOTO(out, rc);
        }
 
-       rc = dt_lookup(env, parent, (struct dt_rec *)tfid,
-                      (const struct dt_key *)name2, BYPASS_CAPA);
-       if (rc != 0 || !lu_fid_eq(cfid, tfid))
+       rc = dt_lookup_dir(env, parent, name2, &tfid);
+       if (rc != 0 || !lu_fid_eq(cfid, &tfid))
                rc = lfsck_namespace_trace_update(env, com, cfid,
                                                  LNTF_UNCERTAIN_LMV, true);
        else
@@ -1255,32 +1860,646 @@ out:
 /**
  * Double scan the striped directory or the shard.
  *
+ * All the shards' under the given striped directory or its shard have
+ * been scanned, the LFSCK has got the global knownledge about the LMV
+ * EA consistency.
+ *
+ * If the target is one shard of a striped directory, then only needs to
+ * update related tracing file.
+ *
+ * If the target is the master MDT-object of a striped directory, then the
+ * LFSCK will make the decision about whether the master LMV EA is invalid
+ * or not, and repair it if inconsistenct; for every shard of the striped
+ * directory, whether the slave LMV EA is invalid or not, and repair it if
+ * inconsistent.
+ *
  * \param[in] env      pointer to the thread context
  * \param[in] com      pointer to the lfsck component
  * \param[in] lnr      pointer to the namespace request that contains the
  *                     striped directory or the shard
  *
- * \retval             zero for succeed
+ * \retval             zero for success
  * \retval             negative error number on failure
  */
 int lfsck_namespace_striped_dir_rescan(const struct lu_env *env,
                                       struct lfsck_component *com,
                                       struct lfsck_namespace_req *lnr)
 {
+       struct lfsck_thread_info        *info   = lfsck_env_info(env);
+       struct lfsck_instance           *lfsck  = com->lc_lfsck;
        struct lfsck_namespace          *ns     = com->lc_file_ram;
        struct lfsck_lmv                *llmv   = lnr->lnr_lmv;
-       struct dt_object                *dir    = lnr->lnr_obj;
+       struct lmv_mds_md_v1            *lmv    = &llmv->ll_lmv;
+       struct lmv_mds_md_v1            *lmv2   = &info->lti_lmv2;
+       struct lfsck_assistant_object   *lso    = lnr->lnr_lar.lar_parent;
+       const struct lu_fid             *pfid   = &lso->lso_fid;
+       struct dt_object                *dir    = NULL;
+       struct dt_object                *obj    = NULL;
+       struct lu_seq_range             *range  = &info->lti_range;
+       struct seq_server_site          *ss     = lfsck_dev_site(lfsck);
+       __u32                            stripe_count;
+       __u32                            hash_type;
+       int                              rc     = 0;
+       int                              i;
        ENTRY;
 
-       /* XXX: it will be improved with subsequent patches landed. */
-
-       if (llmv->ll_lmv_slave && llmv->ll_lmv_verified) {
-               ns->ln_striped_shards_scanned++;
-               lfsck_namespace_trace_update(env, com,
-                                       lfsck_dto2fid(dir),
+       if (llmv->ll_lmv_slave) {
+               if (llmv->ll_lmv_verified) {
+                       ns->ln_striped_shards_scanned++;
+                       lfsck_namespace_trace_update(env, com, pfid,
                                        LNTF_UNCERTAIN_LMV |
                                        LNTF_RECHECK_NAME_HASH, false);
+               }
+
+               RETURN(0);
        }
 
-       RETURN(0);
+       /* Either the striped directory has been disabled or only part of
+        * the striped directory have been scanned. The LFSCK cannot repair
+        * something based on incompleted knowledge. So skip it. */
+       if (llmv->ll_ignore || llmv->ll_exit_value <= 0)
+               RETURN(0);
+
+       /* There ever been some failure, as to the LFSCK cannot know whether
+        * it has got the global knowledge about the LMV EA consistency or not,
+        * so it cannot make reparation about the incompleted knowledge. */
+       if (llmv->ll_failed) {
+               ns->ln_striped_dirs_scanned++;
+               ns->ln_striped_dirs_failed++;
+
+               RETURN(0);
+       }
+
+       if (lmv->lmv_stripe_count > LFSCK_LMV_MAX_STRIPES)
+               stripe_count = max(llmv->ll_max_filled_off + 1,
+                                  llmv->ll_max_stripe_count);
+       else
+               stripe_count = max(llmv->ll_max_filled_off + 1,
+                                  lmv->lmv_stripe_count);
+
+       if (lmv->lmv_stripe_count != stripe_count) {
+               lmv->lmv_stripe_count = stripe_count;
+               llmv->ll_lmv_updated = 1;
+       }
+
+       if (!lmv_is_known_hash_type(lmv->lmv_hash_type) &&
+           !(lmv->lmv_hash_type & LMV_HASH_FLAG_BAD_TYPE) &&
+           lmv_is_known_hash_type(llmv->ll_hash_type)) {
+               hash_type = llmv->ll_hash_type & LMV_HASH_TYPE_MASK;
+               lmv->lmv_hash_type = llmv->ll_hash_type;
+               llmv->ll_lmv_updated = 1;
+       } else {
+               hash_type = lmv->lmv_hash_type & LMV_HASH_TYPE_MASK;
+               if (!lmv_is_known_hash_type(hash_type))
+                       hash_type = LMV_HASH_TYPE_UNKNOWN;
+       }
+
+       if (llmv->ll_lmv_updated) {
+               if (dir == NULL) {
+                       dir = lfsck_assistant_object_load(env, lfsck, lso);
+                       if (IS_ERR(dir)) {
+                               rc = PTR_ERR(dir);
+
+                               RETURN(rc == -ENOENT ? 0 : rc);
+                       }
+               }
+
+               lmv->lmv_layout_version++;
+               rc = lfsck_namespace_update_lmv(env, com, dir, lmv, false);
+               if (rc != 0)
+                       RETURN(rc);
+
+               ns->ln_striped_dirs_scanned++;
+               if (!llmv->ll_counted)
+                       ns->ln_striped_dirs_repaired++;
+       }
+
+       fld_range_set_mdt(range);
+       for (i = 0; i <= llmv->ll_max_filled_off; i++) {
+               struct lfsck_slave_lmv_rec *lslr = llmv->ll_lslr + i;
+               const struct lu_fid *cfid = &lslr->lslr_fid;
+               const struct lu_name *cname;
+               struct linkea_data ldata = { NULL };
+               int rc1 = 0;
+               bool repair_linkea = false;
+               bool repair_lmvea = false;
+               bool rename = false;
+               bool create = false;
+               bool linkea_repaired = false;
+               bool lmvea_repaired = false;
+               bool rename_repaired = false;
+               bool create_repaired = false;
+
+               /* LMV EA hole. */
+               if (fid_is_zero(cfid))
+                       continue;
+
+               lnr->lnr_fid = *cfid;
+               lnr->lnr_namelen = scnprintf(lnr->lnr_name,
+                                            lnr->lnr_size - sizeof(*lnr),
+                                            DFID":%u", PFID(cfid), i);
+               cname = lfsck_name_get_const(env, lnr->lnr_name,
+                                            lnr->lnr_namelen);
+               obj = lfsck_object_find_bottom(env, lfsck, cfid);
+               if (IS_ERR(obj)) {
+                       if (dir == NULL) {
+                               dir = lfsck_assistant_object_load(env, lfsck,
+                                                                 lso);
+                               if (IS_ERR(dir)) {
+                                       if (PTR_ERR(dir) == -ENOENT)
+                                               RETURN(0);
+
+                                       dir = NULL;
+                               }
+                       } else if (lfsck_is_dead_obj(dir)) {
+                               GOTO(out, rc = 0);
+                       }
+
+                       rc1 = PTR_ERR(obj);
+                       goto next;
+               }
+
+               switch (lslr->lslr_flags) {
+               case LSLF_NONE:
+                       if (llmv->ll_inline ||
+                           lslr->lslr_stripe_count != stripe_count ||
+                           (lslr->lslr_hash_type & LMV_HASH_TYPE_MASK) !=
+                            hash_type)
+                               repair_lmvea = true;
+                       break;
+               case LSLF_BAD_INDEX2:
+                       /* The index in the slave LMV EA is right,
+                        * the name entry should be updated. */
+                       rename = true;
+                       snprintf(info->lti_tmpbuf2, sizeof(info->lti_tmpbuf2),
+                                DFID":%u", PFID(cfid), lslr->lslr_index);
+                       if (llmv->ll_inline ||
+                           lslr->lslr_stripe_count != stripe_count ||
+                           (lslr->lslr_hash_type & LMV_HASH_TYPE_MASK) !=
+                            hash_type)
+                               repair_lmvea = true;
+                       break;
+               case LSLF_BAD_INDEX1:
+                       /* The index in the name entry is right,
+                        * the slave LMV EA should be updated. */
+               case LSLF_NO_LMVEA:
+                       repair_lmvea = true;
+                       break;
+               case LSLF_DANGLING:
+                       create = true;
+                       goto repair;
+               default:
+                       break;
+               }
+
+               rc1 = lfsck_links_read_with_rec(env, obj, &ldata);
+               if (rc1 == -ENOENT) {
+                       create = true;
+                       goto repair;
+               }
+
+               if (rc1 == -EINVAL || rc1 == -ENODATA) {
+                       repair_linkea = true;
+                       goto repair;
+               }
+
+               if (rc1 != 0)
+                       goto next;
+
+               if (ldata.ld_leh->leh_reccount != 1) {
+                       repair_linkea = true;
+                       goto repair;
+               }
+
+               rc1 = linkea_links_find(&ldata, cname, pfid);
+               if (rc1 != 0)
+                       repair_linkea = true;
+
+repair:
+               if (create) {
+                       if (dir == NULL) {
+                               dir = lfsck_assistant_object_load(env, lfsck,
+                                                                 lso);
+                               if (IS_ERR(dir)) {
+                                       rc1 = PTR_ERR(dir);
+
+                                       if (rc1 == -ENOENT)
+                                               GOTO(out, rc = 0);
+
+                                       dir = NULL;
+                                       goto next;
+                               }
+                       }
+
+                       rc1 = lfsck_namespace_repair_dangling(env, com, dir,
+                                                             obj, lnr);
+                       if (rc1 >= 0) {
+                               create_repaired = true;
+                               if (rc == 0)
+                                       ns->ln_dangling_repaired++;
+                       }
+               }
+
+               if (repair_lmvea) {
+                       *lmv2 = *lmv;
+                       lmv2->lmv_magic = LMV_MAGIC_STRIPE;
+                       lmv2->lmv_stripe_count = stripe_count;
+                       lmv2->lmv_master_mdt_index = i;
+                       lmv2->lmv_hash_type = hash_type;
+
+                       rc1 = lfsck_namespace_update_lmv(env, com, obj,
+                                                        lmv2, false);
+                       if (rc1 < 0)
+                               goto next;
+
+                       if (dt_object_remote(obj)) {
+                               rc1 = fld_server_lookup(env, ss->ss_server_fld,
+                                       fid_seq(lfsck_dto2fid(obj)), range);
+                               if (rc1 != 0)
+                                       goto next;
+
+                               rc1 = lfsck_namespace_notify_lmv_remote(env,
+                                               com, obj, LE_SET_LMV_SLAVE, 0,
+                                               range->lsr_index);
+                       } else {
+                               ns->ln_striped_shards_repaired++;
+                               rc1 = lfsck_namespace_trace_update(env, com,
+                                       cfid, LNTF_RECHECK_NAME_HASH, true);
+                       }
+
+                       if (rc1 < 0)
+                               goto next;
+
+                       if (rc1 >= 0)
+                               lmvea_repaired = true;
+               } else if (llmv->ll_inline) {
+                       if (dt_object_remote(obj)) {
+                               rc1 = fld_server_lookup(env, ss->ss_server_fld,
+                                       fid_seq(lfsck_dto2fid(obj)), range);
+                               if (rc1 != 0)
+                                       goto next;
+
+                               /* The slave LMV EA on the remote shard is
+                                * correct, just notify the LFSCK instance
+                                * on such MDT to re-verify the name_hash. */
+                               rc1 = lfsck_namespace_notify_lmv_remote(env,
+                                               com, obj, LE_SET_LMV_SLAVE,
+                                               LEF_RECHECK_NAME_HASH,
+                                               range->lsr_index);
+                       } else {
+                               rc1 = lfsck_namespace_trace_update(env, com,
+                                       cfid, LNTF_RECHECK_NAME_HASH, true);
+                       }
+
+                       if (rc1 < 0)
+                               goto next;
+               }
+
+               if (rename) {
+                       if (dir == NULL) {
+                               dir = lfsck_assistant_object_load(env, lfsck,
+                                                                 lso);
+                               if (IS_ERR(dir)) {
+                                       rc1 = PTR_ERR(dir);
+
+                                       if (rc1 == -ENOENT)
+                                               GOTO(out, rc = 0);
+
+                                       dir = NULL;
+                                       goto next;
+                               }
+                       }
+
+                       rc1 = lfsck_namespace_repair_dirent(env, com, dir, obj,
+                                       info->lti_tmpbuf2, lnr->lnr_name,
+                                       lnr->lnr_type, true, false);
+                       if (rc1 >= 0) {
+                               rename_repaired = true;
+                               if (rc1 > 0) {
+                                       ns->ln_dirent_repaired++;
+                                       rc1 = lfsck_namespace_trace_update(env,
+                                               com, cfid,
+                                               LNTF_RECHECK_NAME_HASH, true);
+                               }
+                       }
+
+                       if (rc1 < 0)
+                               goto next;
+               }
+
+               if (repair_linkea) {
+                       struct lustre_handle lh = { 0 };
+
+                       if (dir == NULL) {
+                               dir = lfsck_assistant_object_load(env, lfsck,
+                                                                 lso);
+                               if (IS_ERR(dir)) {
+                                       rc1 = PTR_ERR(dir);
+
+                                       if (rc1 == -ENOENT)
+                                               GOTO(out, rc = 0);
+
+                                       dir = NULL;
+                                       goto next;
+                               }
+                       }
+
+                       rc1 = linkea_links_new(&ldata, &info->lti_big_buf,
+                                              cname, lfsck_dto2fid(dir));
+                       if (rc1 != 0)
+                               goto next;
+
+                       rc1 = lfsck_ibits_lock(env, lfsck, obj, &lh,
+                                              MDS_INODELOCK_UPDATE |
+                                              MDS_INODELOCK_XATTR, LCK_EX);
+                       if (rc1 != 0)
+                               goto next;
+
+                       rc1 = lfsck_namespace_rebuild_linkea(env, com, obj,
+                                                            &ldata);
+                       lfsck_ibits_unlock(&lh, LCK_EX);
+                       if (rc1 >= 0) {
+                               linkea_repaired = true;
+                               if (rc1 > 0)
+                                       ns->ln_linkea_repaired++;
+                       }
+               }
+
+next:
+               if (create || rename || repair_linkea || repair_lmvea) {
+                       CDEBUG(D_LFSCK, "%s: namespace LFSCK repair the shard "
+                              "%d "DFID" of the striped directory "DFID" with "
+                              "dangling %s/%s, rename %s/%s, llinkea %s/%s, "
+                              "repair_lmvea %s/%s: rc = %d\n",
+                              lfsck_lfsck2name(lfsck),
+                              i, PFID(cfid), PFID(pfid),
+                              create ? "yes" : "no",
+                              create_repaired ? "yes" : "no",
+                              rename ? "yes" : "no",
+                              rename_repaired ? "yes" : "no",
+                              repair_linkea ? "yes" : "no",
+                              linkea_repaired ? "yes" : "no",
+                              repair_lmvea ? "yes" : "no",
+                              lmvea_repaired ? "yes" : "no", rc1);
+               }
+
+               if (obj != NULL && !IS_ERR(obj)) {
+                       lfsck_object_put(env, obj);
+                       obj = NULL;
+               }
+
+               if (rc1 < 0) {
+                       rc = rc1;
+                       ns->ln_striped_shards_failed++;
+               }
+       }
+
+       GOTO(out, rc);
+
+out:
+       if (obj != NULL && !IS_ERR(obj))
+               lfsck_object_put(env, obj);
+
+       if (dir != NULL && !IS_ERR(dir))
+               lfsck_object_put(env, dir);
+
+       return rc;
+}
+
+/**
+ * Verify the shard's name entry under the striped directory.
+ *
+ * Before all shards of the striped directory scanned, the LFSCK cannot
+ * know whether the master LMV EA is valid or not, and also cannot know
+ * how to repair an invalid shard exactly. For example, the stripe index
+ * stored in the shard's name does not match the stripe index stored in
+ * the slave LMV EA, then the LFSCK cannot know which one is correct.
+ * If the LFSCK just assumed one is correct, and fixed the other, then
+ * as the LFSCK processing, it may find that the former reparation is
+ * wrong and have to roll back. Unfortunately, if some applications saw
+ * the changes and made further modification based on such changes, then
+ * the roll back is almost impossible.
+ *
+ * To avoid above trouble, the LFSCK will scan the master object of the
+ * striped directory twice, that is NOT the same as normal two-stages
+ * scanning, the double scanning the striped directory will happen both
+ * during the first-stage scanning:
+ *
+ * 1) When the striped directory is opened for scanning, the LFSCK will
+ *    iterate each shard in turn, and records its slave LMV EA in the
+ *    lfsck_lmv::ll_lslr. In this step, if the 'shard' (may be fake
+ *    shard) name does not match the shard naming rule, for example, it
+ *    does not contains the shard's FID, or not contains index, then we
+ *    can remove the bad name entry directly. But if the name is valid,
+ *    but the shard has no slave LMV EA or the slave LMV EA does not
+ *    match its name, then we just record related information in the
+ *    lfsck_lmv::ll_lslr in RAM.
+ *
+ * 2) When all the known shards have been scanned, then the engine will
+ *    generate a dummy request (via lfsck_namespace_close_dir) to tell
+ *    the assistant thread that all the known shards have been scanned.
+ *    Since the assistant has got the global knowledge about the index
+ *    conflict, stripe count, hash type, and so on. Then the assistant
+ *    thread will scan the lfsck_lmv::ll_lslr, and for every shard in
+ *    the record, check and repair inconsistency.
+ *
+ * Generally, the stripe directory has only several shards, and there
+ * will NOT be a lof of striped directory. So double scanning striped
+ * directory will not much affect the LFSCK performance.
+ *
+ * \param[in] env      pointer to the thread context
+ * \param[in] com      pointer to the lfsck component
+ * \param[in] lnr      pointer to the namespace request that contains the
+ *                     shard's name, parent object, parent's LMV, and ect.
+ *
+ * \retval             zero for success
+ * \retval             negative error number on failure
+ */
+int lfsck_namespace_handle_striped_master(const struct lu_env *env,
+                                         struct lfsck_component *com,
+                                         struct lfsck_namespace_req *lnr)
+{
+       struct lfsck_thread_info   *info        = lfsck_env_info(env);
+       struct lmv_mds_md_v1       *lmv         = &info->lti_lmv;
+       struct lfsck_instance      *lfsck       = com->lc_lfsck;
+       struct lfsck_namespace     *ns          = com->lc_file_ram;
+       struct lfsck_lmv           *llmv        = lnr->lnr_lmv;
+       struct lfsck_assistant_object *lso      = lnr->lnr_lar.lar_parent;
+       const struct lu_fid        *pfid        = &lso->lso_fid;
+       struct dt_object           *dir;
+       struct dt_object           *obj         = NULL;
+       struct dt_device           *dev         = NULL;
+       int                         shard_idx   = 0;
+       int                         stripe      = 0;
+       int                         rc          = 0;
+       int                         depth       = 0;
+       bool                        repaired    = false;
+       enum lfsck_namespace_inconsistency_type type = LNIT_NONE;
+       ENTRY;
+
+       if (unlikely(llmv->ll_ignore))
+               RETURN(0);
+
+       dir = lfsck_assistant_object_load(env, lfsck, lso);
+       if (IS_ERR(dir)) {
+               rc = PTR_ERR(dir);
+
+               RETURN(rc == -ENOENT ? 0 : rc);
+       }
+
+       shard_idx = lfsck_find_mdt_idx_by_fid(env, lfsck, &lnr->lnr_fid);
+       if (shard_idx < 0)
+               GOTO(fail_lmv, rc = shard_idx);
+
+       if (shard_idx == lfsck_dev_idx(lfsck)) {
+               if (unlikely(strcmp(lnr->lnr_name, dotdot) == 0))
+                       GOTO(out, rc = 0);
+
+               dev = lfsck->li_bottom;
+       } 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 = lfsck_ltd2tgt(&lfsck->li_mdt_descs, shard_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), shard_idx);
+                       lfsck_lad_set_bitmap(env, com, shard_idx);
+
+                       GOTO(fail_lmv, rc = -ENODEV);
+               }
+
+               dev = ltd->ltd_tgt;
+       }
+
+       obj = lfsck_object_find_by_dev(env, dev, &lnr->lnr_fid);
+       if (IS_ERR(obj)) {
+               if (lfsck_is_dead_obj(dir))
+                       RETURN(0);
+
+               GOTO(fail_lmv, rc = PTR_ERR(obj));
+       }
+
+       if (!dt_object_exists(obj)) {
+               stripe = lfsck_shard_name_to_index(env, lnr->lnr_name,
+                               lnr->lnr_namelen, lnr->lnr_type, &lnr->lnr_fid);
+               if (stripe < 0) {
+                       type = LNIT_BAD_DIRENT;
+
+                       GOTO(out, rc = 0);
+               }
+
+dangling:
+               rc = lfsck_namespace_check_exist(env, dir, obj, lnr->lnr_name);
+               if (rc == 0) {
+                       memset(lmv, 0, sizeof(*lmv));
+                       lmv->lmv_magic = LMV_MAGIC;
+                       rc = lfsck_record_lmv(env, com, dir, lnr, lmv, stripe,
+                                             LSLF_DANGLING, LSLF_NONE, &depth);
+               }
+
+               GOTO(out, rc);
+       }
+
+       stripe = lfsck_shard_name_to_index(env, lnr->lnr_name, lnr->lnr_namelen,
+                                          lfsck_object_type(obj),
+                                          &lnr->lnr_fid);
+       if (stripe < 0) {
+               type = LNIT_BAD_DIRENT;
+
+               GOTO(out, rc = 0);
+       }
+
+       rc = lfsck_read_stripe_lmv(env, lfsck, obj, lmv);
+       if (unlikely(rc == -ENOENT))
+               /* It may happen when the remote object has been removed,
+                * but the local MDT does not aware of that. */
+               goto dangling;
+
+       if (rc == -ENODATA)
+               rc = lfsck_record_lmv(env, com, dir, lnr, lmv, stripe,
+                                     LSLF_NO_LMVEA, LSLF_NONE, &depth);
+       else if (rc == 0)
+               rc = lfsck_record_lmv(env, com, dir, lnr, lmv, stripe,
+                                     lmv->lmv_master_mdt_index != stripe ?
+                                     LSLF_BAD_INDEX1 : LSLF_NONE, LSLF_NONE,
+                                     &depth);
+
+       GOTO(out, rc);
+
+fail_lmv:
+       llmv->ll_failed = 1;
+
+out:
+       if (rc >= 0 && type == LNIT_NONE && !S_ISDIR(lnr->lnr_type))
+               type = LNIT_BAD_TYPE;
+
+       switch (type) {
+       case LNIT_BAD_TYPE:
+               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:
+               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 (rc < 0) {
+               CDEBUG(D_LFSCK, "%s: namespace LFSCK assistant fail to handle "
+                      "the shard: "DFID", parent "DFID", name %.*s: rc = %d\n",
+                      lfsck_lfsck2name(lfsck), PFID(&lnr->lnr_fid),
+                      PFID(pfid), lnr->lnr_namelen, lnr->lnr_name, rc);
+
+               if ((rc == -ENOTCONN || rc == -ESHUTDOWN || rc == -EREMCHG ||
+                    rc == -ETIMEDOUT || rc == -EHOSTDOWN ||
+                    rc == -EHOSTUNREACH || rc == -EINPROGRESS) &&
+                   dev != NULL && dev != lfsck->li_bottom)
+                       lfsck_lad_set_bitmap(env, com, shard_idx);
+
+               if (!(lfsck->li_bookmark_ram.lb_param & LPF_FAILOUT))
+                       rc = 0;
+       } else {
+               if (repaired) {
+                       ns->ln_items_repaired++;
+
+                       switch (type) {
+                       case LNIT_BAD_TYPE:
+                               ns->ln_bad_type_repaired++;
+                               break;
+                       case LNIT_BAD_DIRENT:
+                               ns->ln_dirent_repaired++;
+                               break;
+                       default:
+                               break;
+                       }
+               }
+
+               rc = 0;
+       }
+
+       if (obj != NULL && !IS_ERR(obj))
+               lfsck_object_put(env, obj);
+
+       lfsck_object_put(env, dir);
+
+       return rc;
 }