Whamcloud - gitweb
LU-17676 build: configure should prefer to ask if
[fs/lustre-release.git] / lustre / lfsck / lfsck_striped_dir.c
index 0872896..6716522 100644 (file)
@@ -20,7 +20,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2014, 2015, 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);
@@ -203,15 +200,18 @@ static int lfsck_disable_master_lmv(const struct lu_env *env,
                                    struct lfsck_component *com,
                                    struct dt_object *obj, bool del_lmv)
 {
-       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_obj2dev(obj);
-       struct thandle                  *th     = NULL;
-       int                              rc     = 0;
+       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_obj2dev(obj);
+       struct thandle *th = NULL;
+       int rc = 0;
+
        ENTRY;
+       if (lfsck->li_bookmark_ram.lb_param & LPF_DRYRUN)
+               GOTO(log, rc = 0);
 
-       th = dt_trans_create(env, dev);
+       th = lfsck_trans_create(env, dev, lfsck);
        if (IS_ERR(th))
                GOTO(log, rc = PTR_ERR(th));
 
@@ -234,9 +234,6 @@ static int lfsck_disable_master_lmv(const struct lu_env *env,
        if (unlikely(lfsck_is_dead_obj(obj)))
                GOTO(unlock, rc = 1);
 
-       if (lfsck->li_bookmark_ram.lb_param & LPF_DRYRUN)
-               GOTO(unlock, rc = 0);
-
        if (del_lmv) {
                rc = dt_xattr_del(env, obj, XATTR_NAME_LMV, th);
                if (rc != 0)
@@ -259,8 +256,8 @@ stop:
        dt_trans_stop(env, dev, th);
 
 log:
-       CDEBUG(D_LFSCK, "%s: namespace LFSCK set the master MDT-object of "
-              "the striped directory "DFID" as read-only: rc = %d\n",
+       CDEBUG(D_LFSCK,
+              "%s: namespace LFSCK set the master MDT-object of the striped directory "DFID" as read-only: rc = %d\n",
               lfsck_lfsck2name(lfsck), PFID(lfsck_dto2fid(obj)), rc);
 
        if (rc <= 0) {
@@ -303,8 +300,8 @@ static int lfsck_remove_lmv(const struct lu_env *env,
                            struct dt_object *obj,
                            struct lfsck_namespace_req *lnr)
 {
-       struct lustre_handle     lh     = { 0 };
-       int                      rc;
+       struct lustre_handle lh = { 0 };
+       int rc;
 
        lnr->lnr_lmv->ll_ignore = 1;
        rc = lfsck_ibits_lock(env, com->lc_lfsck, obj, &lh,
@@ -336,9 +333,9 @@ static int lfsck_remove_dirent(const struct lu_env *env,
                               struct dt_object *dir,
                               const struct lu_fid *fid, __u32 index)
 {
-       struct lfsck_thread_info        *info = lfsck_env_info(env);
-       struct dt_object                *obj;
-       int                              rc;
+       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);
@@ -391,7 +388,7 @@ static int lfsck_replace_lmv(const struct lu_env *env,
                             __u32 index, __u32 flags)
 {
        struct lfsck_lmv *llmv = lnr->lnr_lmv;
-       int               rc;
+       int rc;
 
        rc = lfsck_remove_dirent(env, com, dir,
                                 &lslr->lslr_fid, index);
@@ -489,19 +486,18 @@ static int lfsck_record_lmv(const struct lu_env *env,
                            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_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;
+       int index = shard_idx;
+       int rc = 0;
 
-       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),
+       ENTRY;
+       CDEBUG(D_INFO,
+              "%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)
@@ -512,7 +508,7 @@ static int lfsck_record_lmv(const struct lu_env *env,
                int new_stripes = index + 1;
                size_t old_size = sizeof(*lslr) * llmv->ll_stripes_allocated;
 
-               OBD_ALLOC_LARGE(new_lslr, sizeof(*new_lslr) * new_stripes);
+               OBD_ALLOC_PTR_ARRAY_LARGE(new_lslr, new_stripes);
                if (new_lslr == NULL) {
                        llmv->ll_failed = 1;
 
@@ -564,13 +560,13 @@ static int lfsck_record_lmv(const struct lu_env *env,
                /* 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. */
+                       /* 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:
@@ -580,21 +576,21 @@ static int lfsck_record_lmv(const struct lu_env *env,
 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. */
+                               /* 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. */
+                                * for further processing.
+                                */
                                rc = lfsck_namespace_trace_update(env, com, fid,
                                                LNTF_CHECK_PARENT, true);
                                if (rc == 0)
@@ -612,16 +608,17 @@ no_lmvea:
                        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. */
+                        * 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'. */
+                               /* The index in the lmv is invalid or conflict
+                                * with other. Then we do not know how to solve
+                                * 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;
@@ -638,24 +635,24 @@ no_lmvea:
 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. */
+                               /* 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. */
+                                * 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);
@@ -681,7 +678,8 @@ none:
                        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. */
+                        * 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;
@@ -703,13 +701,15 @@ none:
                case LSLF_BAD_INDEX2:
                case LSLF_NO_LMVEA:
                        /* Remove the existing dangling name entry.
-                        * Refill the lslr slot with the given LMV. */
+                        * 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. */
+                        * remove the current one.
+                        */
                        rc = lfsck_remove_dirent(env, com, dir, fid, index);
                        break;
                case LSLF_BAD_INDEX1:
@@ -717,7 +717,8 @@ none:
                        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. */
+                        * 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;
@@ -725,7 +726,8 @@ none:
                                /* 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. */
+                                * Refill the lslr slot with the given LMV.
+                                */
                                rc = lfsck_replace_lmv(env, com, dir, lslr, lnr,
                                                       lmv, shard_idx, flags);
 
@@ -749,8 +751,7 @@ none:
                lmv->lmv_hash_type = lslr->lslr_hash_type;
                index = lslr->lslr_index;
 
-               /* The existing one has another possible slot,
-                * try it recursively. */
+               /* Existing one has another possible slot, try recursively. */
                rc = lfsck_record_lmv(env, com, dir, lnr, lmv, index,
                                      LSLF_BAD_INDEX2, flags, depth);
                *lmv = lrls->lrls_lmv;
@@ -790,7 +791,8 @@ conflict:
                         * 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. */
+                        * more human knowledge.
+                        */
                        rc = lfsck_remove_lmv(env, com, dir, lnr);
                        break;
                case LSLF_BAD_INDEX2:
@@ -806,16 +808,17 @@ conflict:
                        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. */
+                        * 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'. */
+                               /* 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;
@@ -838,26 +841,92 @@ out:
        return rc > 0 ? 0 : rc;
 }
 
-int lfsck_read_stripe_lmv(const struct lu_env *env, struct dt_object *obj,
+/**
+ * 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);
-       rc = dt_xattr_get(env, obj, lfsck_buf_get(env, lmv, sizeof(*lmv)),
-                         XATTR_NAME_LMV);
+       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);
-       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;
+       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 -ENODATA;
+       return rc;
 }
 
 /**
@@ -880,9 +949,9 @@ int lfsck_read_stripe_lmv(const struct lu_env *env, struct dt_object *obj,
 int lfsck_shard_name_to_index(const struct lu_env *env, const char *name,
                              int namelen, __u16 type, const struct lu_fid *fid)
 {
-       char    *name2  = lfsck_env_info(env)->lti_tmpbuf2;
-       int      len;
-       int      idx    = 0;
+       char *name2 = lfsck_env_info(env)->lti_tmpbuf2;
+       int len;
+       int idx = 0;
 
        if (!S_ISDIR(type))
                return -ENOTDIR;
@@ -907,24 +976,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);
 }
 
 /**
@@ -946,15 +1021,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);
 
@@ -962,11 +1037,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),
@@ -995,19 +1067,22 @@ int lfsck_namespace_update_lmv(const struct lu_env *env,
                               struct dt_object *obj,
                               struct lmv_mds_md_v1 *lmv, bool locked)
 {
-       struct lfsck_thread_info        *info   = lfsck_env_info(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_obj2dev(obj);
-       struct thandle                  *th     = NULL;
-       struct lustre_handle             lh     = { 0 };
-       int                              rc     = 0;
-       int                              rc1    = 0;
-       ENTRY;
+       struct lfsck_thread_info *info = lfsck_env_info(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_obj2dev(obj);
+       struct thandle *th = NULL;
+       struct lustre_handle lh = { 0 };
+       int rc = 0;
+       int rc1 = 0;
 
+       ENTRY;
        LASSERT(lmv4 != lmv);
 
+       if (lfsck->li_bookmark_ram.lb_param & LPF_DRYRUN)
+               GOTO(out, rc = 0);
+
        lfsck_lmv_header_cpu_to_le(lmv4, lmv);
        lfsck_buf_init(buf, lmv4, sizeof(*lmv4));
 
@@ -1019,12 +1094,13 @@ int lfsck_namespace_update_lmv(const struct lu_env *env,
                        GOTO(log, rc);
        }
 
-       th = dt_trans_create(env, dev);
+       th = lfsck_trans_create(env, dev, lfsck);
        if (IS_ERR(th))
                GOTO(log, rc = PTR_ERR(th));
 
        /* For remote updating LMV EA, there will be further LFSCK action on
-        * remote MDT after the updating, so update the LMV EA synchronously. */
+        * remote MDT after the updating, so update the LMV EA synchronously.
+        */
        if (dt_object_remote(obj))
                th->th_sync = 1;
 
@@ -1040,9 +1116,6 @@ int lfsck_namespace_update_lmv(const struct lu_env *env,
        if (unlikely(lfsck_is_dead_obj(obj)))
                GOTO(unlock, rc = 1);
 
-       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);
 
        GOTO(unlock, rc);
@@ -1057,8 +1130,10 @@ stop:
 
 log:
        lfsck_ibits_unlock(&lh, LCK_EX);
-       CDEBUG(D_LFSCK, "%s: namespace LFSCK updated the %s LMV EA "
-              "for the object "DFID": rc = %d\n",
+
+out:
+       CDEBUG(D_LFSCK,
+              "%s: namespace LFSCK updated the %s LMV EA for the object "DFID": rc = %d\n",
               lfsck_lfsck2name(lfsck),
               lmv->lmv_magic == LMV_MAGIC ? "master" : "slave",
               PFID(lfsck_dto2fid(obj)), rc);
@@ -1092,20 +1167,19 @@ static int lfsck_allow_regenerate_master_lmv(const struct lu_env *env,
                                             const struct lu_fid *cfid,
                                             __u32 cidx)
 {
-       struct lfsck_thread_info        *info   = lfsck_env_info(env);
-       struct lu_fid                   *tfid   = &info->lti_fid3;
-       struct lfsck_instance           *lfsck  = com->lc_lfsck;
-       struct lu_dirent                *ent    =
-                       (struct lu_dirent *)info->lti_key;
-       const struct dt_it_ops          *iops;
-       struct dt_it                    *di;
-       __u64                            cookie;
-       __u32                            args;
-       int                              rc;
-       __u16                            type;
-       ENTRY;
+       struct lfsck_thread_info *info = lfsck_env_info(env);
+       struct lu_fid *tfid = &info->lti_fid3;
+       struct lfsck_instance *lfsck = com->lc_lfsck;
+       struct lu_dirent *ent = (struct lu_dirent *)info->lti_key;
+       const struct dt_it_ops *iops;
+       struct dt_it *di;
+       __u64 cookie;
+       __u32 args;
+       int rc;
+       __u16 type;
 
-       if (unlikely(!dt_try_as_dir(env, obj)))
+       ENTRY;
+       if (unlikely(!dt_try_as_dir(env, obj, true)))
                RETURN(-ENOTDIR);
 
        /* Check whether the shard and the master MDT-object matches or not. */
@@ -1162,7 +1236,8 @@ static int lfsck_allow_regenerate_master_lmv(const struct lu_env *env,
                 *      will cause such subdir to be invisible to client, and
                 *      if its index occupies some lost shard index, then the
                 *      LFSCK will use it to replace the bad shard, and cause
-                *      the subdir (itself) to be invisible for ever. */
+                *      the subdir (itself) to be invisible for ever.
+                */
                if (lfsck_shard_name_to_index(env, ent->lde_name,
                                ent->lde_namelen, type, &ent->lde_fid) < 0)
                        GOTO(out, rc = 1);
@@ -1200,14 +1275,14 @@ static int lfsck_namespace_notify_lmv_remote(const struct lu_env *env,
                                             __u32 event, __u32 flags,
                                             __u32 index)
 {
-       struct lfsck_request            *lr     = &lfsck_env_info(env)->lti_lr;
-       const struct lu_fid             *fid    = lfsck_dto2fid(obj);
-       struct lfsck_instance           *lfsck  = com->lc_lfsck;
-       struct lfsck_tgt_desc           *ltd    = NULL;
-       struct ptlrpc_request           *req    = NULL;
-       int                              rc;
-       ENTRY;
+       struct lfsck_request *lr = &lfsck_env_info(env)->lti_lr;
+       const struct lu_fid *fid = lfsck_dto2fid(obj);
+       struct lfsck_instance *lfsck = com->lc_lfsck;
+       struct lfsck_tgt_desc *ltd = NULL;
+       struct ptlrpc_request *req = NULL;
+       int rc;
 
+       ENTRY;
        ltd = lfsck_tgt_get(&lfsck->li_mdt_descs, index);
        if (ltd == NULL)
                GOTO(out, rc = -ENODEV);
@@ -1234,15 +1309,14 @@ static int lfsck_namespace_notify_lmv_remote(const struct lu_env *env,
 
        ptlrpc_request_set_replen(req);
        rc = ptlrpc_queue_wait(req);
-       ptlrpc_req_finished(req);
+       ptlrpc_req_put(req);
 
        GOTO(out, rc = (rc == -ENOENT ? 1 : rc));
 
 out:
-       CDEBUG(D_LFSCK, "%s: namespace LFSCK notify LMV EA updated for the "
-              "object "DFID" on MDT %x remotely with event %u, flags %u: "
-              "rc = %d\n", lfsck_lfsck2name(lfsck), PFID(fid), index,
-              event, flags, rc);
+       CDEBUG(D_LFSCK,
+              "%s: namespace LFSCK notify LMV EA updated for the object "DFID" on MDT %x remotely with event %u, flags %u: rc = %d\n",
+              lfsck_lfsck2name(lfsck), PFID(fid), index, event, flags, rc);
 
        if (ltd != NULL)
                lfsck_tgt_put(ltd);
@@ -1265,20 +1339,20 @@ int lfsck_namespace_notify_lmv_master_local(const struct lu_env *env,
                                            struct lfsck_component *com,
                                            struct dt_object *obj)
 {
-       struct lfsck_instance      *lfsck = com->lc_lfsck;
-       struct lfsck_namespace     *ns    = com->lc_file_ram;
-       struct lmv_mds_md_v1       *lmv4  = &lfsck_env_info(env)->lti_lmv4;
-       struct lfsck_lmv_unit      *llu;
-       struct lfsck_lmv           *llmv;
+       struct lfsck_instance *lfsck = com->lc_lfsck;
+       struct lfsck_namespace *ns = com->lc_file_ram;
+       struct lmv_mds_md_v1 *lmv4 = &lfsck_env_info(env)->lti_lmv4;
+       struct lfsck_lmv_unit *llu;
+       struct lfsck_lmv *llmv;
        struct lfsck_slave_lmv_rec *lslr;
-       int                         count = 0;
-       int                         rc;
-       ENTRY;
+       int count = 0;
+       int rc;
 
+       ENTRY;
        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);
 
@@ -1293,7 +1367,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);
 
@@ -1320,6 +1394,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);
@@ -1363,16 +1438,16 @@ static int lfsck_namespace_set_lmv_master(const struct lu_env *env,
                                          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 seq_server_site          *ss     = lfsck_dev_site(lfsck);
-       struct lustre_handle             lh     = { 0 };
-       int                              pidx   = -1;
-       int                              rc     = 0;
-       ENTRY;
+       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 seq_server_site *ss = lfsck_dev_site(lfsck);
+       struct lustre_handle lh = { 0 };
+       int pidx = -1;
+       int rc = 0;
 
+       ENTRY;
        fld_range_set_mdt(range);
        rc = fld_server_lookup(env, ss->ss_server_fld,
                               fid_seq(lfsck_dto2fid(obj)), range);
@@ -1386,7 +1461,7 @@ static int lfsck_namespace_set_lmv_master(const struct lu_env *env,
        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);
@@ -1404,6 +1479,7 @@ 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_regenerate_master_lmv(env, com, obj,
@@ -1476,16 +1552,15 @@ int lfsck_namespace_repair_bad_name_hash(const struct lu_env *env,
                                         struct lfsck_lmv *llmv,
                                         const char *name)
 {
-       struct lfsck_thread_info        *info   = lfsck_env_info(env);
-       struct lu_fid                   *pfid   = &info->lti_fid3;
-       struct lmv_mds_md_v1            *lmv2   = &info->lti_lmv2;
-       struct lfsck_instance           *lfsck  = com->lc_lfsck;
-       struct dt_object                *parent = NULL;
-       int                              rc     = 0;
-       ENTRY;
+       struct lfsck_thread_info *info = lfsck_env_info(env);
+       struct lu_fid *pfid = &info->lti_fid3;
+       struct lmv_mds_md_v1 *lmv2 = &info->lti_lmv2;
+       struct lfsck_instance *lfsck = com->lc_lfsck;
+       struct dt_object *parent = NULL;
+       int rc = 0;
 
-       rc = dt_lookup(env, shard, (struct dt_rec *)pfid,
-                      (const struct dt_key *)dotdot);
+       ENTRY;
+       rc = dt_lookup_dir(env, shard, dotdot, pfid);
        if (rc != 0 || !fid_is_sane(pfid))
                GOTO(log, rc);
 
@@ -1496,11 +1571,16 @@ int lfsck_namespace_repair_bad_name_hash(const struct lu_env *env,
        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. */
+                * 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;
+       /* only set BAD_TYPE here, do not clear hash type or MIGRATION flag,
+        * so that user can resume dir migration if this is caused by dir
+        * migration failure.
+        */
+       lmv2->lmv_hash_type |= LMV_HASH_FLAG_BAD_TYPE;
        rc = lfsck_namespace_set_lmv_master(env, com, parent, lmv2,
                                            lfsck_dto2fid(shard),
                                            llmv->ll_lmv.lmv_master_mdt_index,
@@ -1509,9 +1589,8 @@ int lfsck_namespace_repair_bad_name_hash(const struct lu_env *env,
        GOTO(log, rc);
 
 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",
+       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),
               PFID(pfid), name, llmv->ll_lmv.lmv_master_mdt_index,
               PFID(lfsck_dto2fid(shard)), rc);
@@ -1546,31 +1625,30 @@ int lfsck_namespace_scan_shard(const struct lu_env *env,
                               struct lfsck_component *com,
                               struct dt_object *child)
 {
-       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 ptlrpc_thread            *thread = &lfsck->li_thread;
-       struct lu_dirent                *ent    =
-                       (struct lu_dirent *)info->lti_key;
-       struct lfsck_bookmark           *bk     = &lfsck->li_bookmark_ram;
-       struct lfsck_lmv                *llmv   = NULL;
-       const struct dt_it_ops          *iops;
-       struct dt_it                    *di;
-       __u64                            cookie;
-       __u32                            args;
-       int                              rc;
-       __u16                            type;
-       ENTRY;
+       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 ptlrpc_thread *thread = &lfsck->li_thread;
+       struct lu_dirent *ent = (struct lu_dirent *)info->lti_key;
+       struct lfsck_bookmark *bk = &lfsck->li_bookmark_ram;
+       struct lfsck_lmv *llmv = NULL;
+       const struct dt_it_ops *iops;
+       struct dt_it *di;
+       __u64 cookie;
+       __u32 args;
+       int rc;
+       __u16 type;
 
-       rc = lfsck_read_stripe_lmv(env, child, lmv);
+       ENTRY;
+       rc = lfsck_read_stripe_lmv(env, lfsck, child, lmv);
        if (rc != 0)
                RETURN(rc == -ENODATA ? 1 : rc);
 
        if (lmv->lmv_magic != LMV_MAGIC_STRIPE)
                RETURN(1);
 
-       if (unlikely(!dt_try_as_dir(env, child)))
+       if (unlikely(!dt_try_as_dir(env, child, true)))
                RETURN(-ENOTDIR);
 
        OBD_ALLOC_PTR(llmv);
@@ -1631,7 +1709,7 @@ int lfsck_namespace_scan_shard(const struct lu_env *env,
                if (unlikely(!thread_is_running(thread)))
                        GOTO(out, rc = 0);
 
-               if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_FATAL2)) {
+               if (CFS_FAIL_CHECK(OBD_FAIL_LFSCK_FATAL2)) {
                        spin_lock(&lfsck->li_lock);
                        thread_set_flags(thread, SVC_STOPPING);
                        spin_unlock(&lfsck->li_lock);
@@ -1674,19 +1752,19 @@ int lfsck_namespace_verify_stripe_slave(const struct lu_env *env,
                                        struct dt_object *obj,
                                        struct lfsck_lmv *llmv)
 {
-       struct lfsck_thread_info        *info   = lfsck_env_info(env);
-       char                            *name   = info->lti_key;
-       char                            *name2;
-       struct lu_fid                   *pfid   = &info->lti_fid3;
-       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;
-       struct dt_object                *parent = NULL;
-       int                              rc     = 0;
-       ENTRY;
+       struct lfsck_thread_info *info = lfsck_env_info(env);
+       char *name = info->lti_key;
+       char *name2;
+       struct lu_fid *pfid = &info->lti_fid3;
+       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;
+       struct dt_object *parent = NULL;
+       int rc = 0;
 
+       ENTRY;
        if (!lfsck_is_valid_slave_lmv(clmv)) {
                rc = lfsck_namespace_trace_update(env, com, cfid,
                                        LNTF_UNCERTAIN_LMV, true);
@@ -1694,8 +1772,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);
+       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);
@@ -1703,6 +1780,8 @@ int lfsck_namespace_verify_stripe_slave(const struct lu_env *env,
                GOTO(out, rc);
        }
 
+       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,
@@ -1714,16 +1793,17 @@ int lfsck_namespace_verify_stripe_slave(const struct lu_env *env,
        if (unlikely(!dt_object_exists(parent)))
                GOTO(out, rc = 1);
 
-       if (unlikely(!dt_try_as_dir(env, parent)))
+       if (unlikely(!dt_try_as_dir(env, parent, true)))
                GOTO(out, rc = -ENOTDIR);
 
-       rc = lfsck_read_stripe_lmv(env, parent, plmv);
+       rc = lfsck_read_stripe_lmv(env, lfsck, parent, plmv);
        if (rc != 0) {
                int rc1;
 
                /* If the parent has no LMV EA, then it maybe because:
                 * 1) The parent lost the LMV EA.
-                * 2) The child claims a wrong (slave) LMV EA. */
+                * 2) The child claims a wrong (slave) LMV EA.
+                */
                if (rc == -ENODATA)
                        rc = lfsck_namespace_set_lmv_master(env, com, parent,
                                        clmv, cfid, clmv->lmv_master_mdt_index,
@@ -1747,7 +1827,8 @@ int lfsck_namespace_verify_stripe_slave(const struct lu_env *env,
        }
 
        /* If the master hash type has been set as LMV_HASH_TYPE_UNKNOWN,
-        * then the slave hash type is not important. */
+        * then the slave hash type is not important.
+        */
        if ((plmv->lmv_hash_type & LMV_HASH_TYPE_MASK) ==
            LMV_HASH_TYPE_UNKNOWN &&
            plmv->lmv_hash_type & LMV_HASH_FLAG_BAD_TYPE)
@@ -1773,8 +1854,7 @@ int lfsck_namespace_verify_stripe_slave(const struct lu_env *env,
                GOTO(out, rc);
        }
 
-       rc = dt_lookup(env, parent, (struct dt_rec *)&tfid,
-                      (const struct dt_key *)name2);
+       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);
@@ -1818,24 +1898,24 @@ 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 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;
+       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 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;
        if (llmv->ll_lmv_slave) {
                if (llmv->ll_lmv_verified) {
                        ns->ln_striped_shards_scanned++;
@@ -1849,13 +1929,15 @@ int lfsck_namespace_striped_dir_rescan(const struct lu_env *env,
 
        /* 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. */
+        * 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. */
+        * so it cannot make reparation about the incompleted knowledge.
+        */
        if (llmv->ll_failed) {
                ns->ln_striped_dirs_scanned++;
                ns->ln_striped_dirs_failed++;
@@ -1903,7 +1985,8 @@ int lfsck_namespace_striped_dir_rescan(const struct lu_env *env,
                        RETURN(rc);
 
                ns->ln_striped_dirs_scanned++;
-               ns->ln_striped_dirs_repaired++;
+               if (!llmv->ll_counted)
+                       ns->ln_striped_dirs_repaired++;
        }
 
        fld_range_set_mdt(range);
@@ -1912,7 +1995,6 @@ int lfsck_namespace_striped_dir_rescan(const struct lu_env *env,
                const struct lu_fid *cfid = &lslr->lslr_fid;
                const struct lu_name *cname;
                struct linkea_data ldata = { NULL };
-               int len;
                int rc1 = 0;
                bool repair_linkea = false;
                bool repair_lmvea = false;
@@ -1927,11 +2009,12 @@ int lfsck_namespace_striped_dir_rescan(const struct lu_env *env,
                if (fid_is_zero(cfid))
                        continue;
 
-               len = snprintf(info->lti_tmpbuf, sizeof(info->lti_tmpbuf),
-                              DFID":%u", PFID(cfid), i);
-               cname = lfsck_name_get_const(env, info->lti_tmpbuf, len);
-               memcpy(lnr->lnr_name, info->lti_tmpbuf, len);
-
+               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) {
@@ -1961,7 +2044,8 @@ int lfsck_namespace_striped_dir_rescan(const struct lu_env *env,
                        break;
                case LSLF_BAD_INDEX2:
                        /* The index in the slave LMV EA is right,
-                        * the name entry should be updated. */
+                        * the name entry should be updated.
+                        */
                        rename = true;
                        snprintf(info->lti_tmpbuf2, sizeof(info->lti_tmpbuf2),
                                 DFID":%u", PFID(cfid), lslr->lslr_index);
@@ -1973,7 +2057,8 @@ int lfsck_namespace_striped_dir_rescan(const struct lu_env *env,
                        break;
                case LSLF_BAD_INDEX1:
                        /* The index in the name entry is right,
-                        * the slave LMV EA should be updated. */
+                        * the slave LMV EA should be updated.
+                        */
                case LSLF_NO_LMVEA:
                        repair_lmvea = true;
                        break;
@@ -2073,7 +2158,8 @@ repair:
 
                                /* The slave LMV EA on the remote shard is
                                 * correct, just notify the LFSCK instance
-                                * on such MDT to re-verify the name_hash. */
+                                * 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,
@@ -2122,11 +2208,6 @@ repair:
                if (repair_linkea) {
                        struct lustre_handle lh = { 0 };
 
-                       rc1 = linkea_links_new(&ldata, &info->lti_big_buf,
-                                              cname, lfsck_dto2fid(dir));
-                       if (rc1 != 0)
-                               goto next;
-
                        if (dir == NULL) {
                                dir = lfsck_assistant_object_load(env, lfsck,
                                                                  lso);
@@ -2141,6 +2222,11 @@ repair:
                                }
                        }
 
+                       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);
@@ -2158,17 +2244,20 @@ repair:
                }
 
 next:
-               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(&lnr->lnr_fid),
-                     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 (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);
@@ -2246,24 +2335,24 @@ 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;
+       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;
 
+       ENTRY;
        if (unlikely(llmv->ll_ignore))
                RETURN(0);
 
@@ -2288,7 +2377,8 @@ int lfsck_namespace_handle_striped_master(const struct lu_env *env,
 
                /* Usually, some local filesystem consistency verification
                 * tools can guarantee the local namespace tree consistenct.
-                * So the LFSCK will only verify the remote directory. */
+                * 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);
@@ -2298,8 +2388,8 @@ int lfsck_namespace_handle_striped_master(const struct lu_env *env,
 
                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",
+                       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);
 
@@ -2347,10 +2437,11 @@ dangling:
                GOTO(out, rc = 0);
        }
 
-       rc = lfsck_read_stripe_lmv(env, obj, lmv);
+       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. */
+                * but the local MDT does not aware of that.
+                */
                goto dangling;
 
        if (rc == -ENODATA)
@@ -2391,8 +2482,8 @@ out:
        }
 
        if (rc < 0) {
-               CDEBUG(D_LFSCK, "%s: namespace LFSCK assistant fail to handle "
-                      "the shard: "DFID", parent "DFID", name %.*s: rc = %d\n",
+               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);