Whamcloud - gitweb
LU-14448 lod: verify LOV before set/inherit
[fs/lustre-release.git] / lustre / lod / lod_object.c
index 2b6f557..95319e5 100644 (file)
@@ -344,7 +344,7 @@ static int lod_it_key_rec(const struct lu_env *env, const struct dt_it *di,
                                                         key_rec);
 }
 
-static struct dt_index_operations lod_index_ops = {
+static const struct dt_index_operations lod_index_ops = {
        .dio_lookup             = lod_lookup,
        .dio_declare_insert     = lod_declare_insert,
        .dio_insert             = lod_insert,
@@ -367,6 +367,50 @@ static struct dt_index_operations lod_index_ops = {
 };
 
 /**
+ * Implementation of dt_index_operations::dio_lookup
+ *
+ * Used with striped directories.
+ *
+ * \see dt_index_operations::dio_lookup() in the API description for details.
+ */
+static int lod_striped_lookup(const struct lu_env *env, struct dt_object *dt,
+                     struct dt_rec *rec, const struct dt_key *key)
+{
+       struct lod_object *lo = lod_dt_obj(dt);
+       struct dt_object *next;
+       const char *name = (const char *)key;
+
+       LASSERT(lo->ldo_dir_stripe_count > 0);
+
+       if (strcmp(name, dot) == 0) {
+               struct lu_fid *fid = (struct lu_fid *)rec;
+
+               *fid = *lod_object_fid(lo);
+               return 1;
+       }
+
+       if (strcmp(name, dotdot) == 0) {
+               next = dt_object_child(dt);
+       } else {
+               int index;
+
+               index = __lmv_name_to_stripe_index(lo->ldo_dir_hash_type,
+                                                  lo->ldo_dir_stripe_count,
+                                                  lo->ldo_dir_migrate_hash,
+                                                  lo->ldo_dir_migrate_offset,
+                                                  name, strlen(name), true);
+               if (index < 0)
+                       return index;
+
+               next = lo->ldo_stripe[index];
+               if (!next || !dt_object_exists(next))
+                       return -ENODEV;
+       }
+
+       return next->do_index_ops->dio_lookup(env, next, rec, key);
+}
+
+/**
  * Implementation of dt_it_ops::init.
  *
  * Used with striped objects. Internally just initializes the iterator
@@ -743,8 +787,8 @@ static int lod_striped_it_load(const struct lu_env *env,
        return next->do_index_ops->dio_it.load(env, it->lit_it, hash);
 }
 
-static struct dt_index_operations lod_striped_index_ops = {
-       .dio_lookup             = lod_lookup,
+static const struct dt_index_operations lod_striped_index_ops = {
+       .dio_lookup             = lod_striped_lookup,
        .dio_declare_insert     = lod_declare_insert,
        .dio_insert             = lod_insert,
        .dio_declare_delete     = lod_declare_delete,
@@ -871,18 +915,17 @@ int lod_load_lmv_shards(const struct lu_env *env, struct lod_object *lo,
                                goto next;
                }
 
-               len = snprintf(name, sizeof(name),
-                              DFID":", PFID(&ent->lde_fid));
+               len = scnprintf(name, sizeof(name),
+                               DFID":", PFID(&ent->lde_fid));
                /* The ent->lde_name is composed of ${FID}:${index} */
                if (ent->lde_namelen < len + 1 ||
                    memcmp(ent->lde_name, name, len) != 0) {
-                       CDEBUG(lod->lod_lmv_failout ? D_ERROR : D_INFO,
-                              "%s: invalid shard name %.*s with the FID "DFID
-                              " for the striped directory "DFID", %s\n",
-                              lod2obd(lod)->obd_name, ent->lde_namelen,
-                              ent->lde_name, PFID(&fid),
-                              PFID(lu_object_fid(&obj->do_lu)),
-                              lod->lod_lmv_failout ? "failout" : "skip");
+                       CDEBUG_LIMIT(lod->lod_lmv_failout ? D_ERROR : D_INFO,
+                                    "%s: invalid shard name %.*s with the FID "DFID" for the striped directory "DFID", %s\n",
+                                    lod2obd(lod)->obd_name, ent->lde_namelen,
+                                    ent->lde_name, PFID(&fid),
+                                    PFID(lu_object_fid(&obj->do_lu)),
+                                    lod->lod_lmv_failout ? "failout" : "skip");
 
                        if (lod->lod_lmv_failout)
                                break;
@@ -894,15 +937,15 @@ int lod_load_lmv_shards(const struct lu_env *env, struct lod_object *lo,
                do {
                        if (ent->lde_name[len] < '0' ||
                            ent->lde_name[len] > '9') {
-                               CDEBUG(lod->lod_lmv_failout ? D_ERROR : D_INFO,
-                                      "%s: invalid shard name %.*s with the "
-                                      "FID "DFID" for the striped directory "
-                                      DFID", %s\n",
-                                      lod2obd(lod)->obd_name, ent->lde_namelen,
-                                      ent->lde_name, PFID(&fid),
-                                      PFID(lu_object_fid(&obj->do_lu)),
-                                      lod->lod_lmv_failout ?
-                                      "failout" : "skip");
+                               CDEBUG_LIMIT(lod->lod_lmv_failout ?
+                                            D_ERROR : D_INFO,
+                                            "%s: invalid shard name %.*s with the FID "DFID" for the striped directory "DFID", %s\n",
+                                            lod2obd(lod)->obd_name,
+                                            ent->lde_namelen,
+                                            ent->lde_name, PFID(&fid),
+                                            PFID(lu_object_fid(&obj->do_lu)),
+                                            lod->lod_lmv_failout ?
+                                            "failout" : "skip");
 
                                if (lod->lod_lmv_failout)
                                        break;
@@ -1075,16 +1118,57 @@ static int lod_attr_get(const struct lu_env *env,
        return dt_attr_get(env, dt_object_child(dt), attr);
 }
 
+void lod_adjust_stripe_size(struct lod_layout_component *comp,
+                           __u32 def_stripe_size)
+{
+       __u64 comp_end = comp->llc_extent.e_end;
+
+       /* Choose stripe size if not set. Note that default stripe size can't
+        * be used as is, because it must be multiplier of given component end.
+        *  - first check if default stripe size can be used
+        *  - if not than select the lowest set bit from component end and use
+        *    that value as stripe size
+        */
+       if (!comp->llc_stripe_size) {
+               if (comp_end == LUSTRE_EOF || !(comp_end % def_stripe_size))
+                       comp->llc_stripe_size = def_stripe_size;
+               else
+                       comp->llc_stripe_size = comp_end & ~(comp_end - 1);
+       } else {
+               if (comp_end != LUSTRE_EOF &&
+                   comp_end & (LOV_MIN_STRIPE_SIZE - 1)) {
+                       CWARN("Component end %llu is not a multiple of min size %u\n",
+                             comp_end, LOV_MIN_STRIPE_SIZE);
+                       comp_end = round_up(comp_end, LOV_MIN_STRIPE_SIZE);
+               }
+               /* check stripe size is multiplier of comp_end */
+               if (comp_end != LUSTRE_EOF &&
+                   comp_end != comp->llc_extent.e_start &&
+                   comp_end % comp->llc_stripe_size) {
+                       /* fix that even for defined stripe size but warn
+                        * about the problem, that must not happen
+                        */
+                       CWARN("Component end %llu is not aligned by the stripe size %u\n",
+                             comp_end, comp->llc_stripe_size);
+                       comp->llc_stripe_size = comp_end & ~(comp_end - 1);
+               }
+       }
+}
+
 static inline void lod_adjust_stripe_info(struct lod_layout_component *comp,
-                                         struct lov_desc *desc)
+                                         struct lov_desc *desc,
+                                         int append_stripes)
 {
        if (comp->llc_pattern != LOV_PATTERN_MDT) {
-               if (!comp->llc_stripe_count)
+               if (append_stripes) {
+                       comp->llc_stripe_count = append_stripes;
+               } else if (!comp->llc_stripe_count) {
                        comp->llc_stripe_count =
                                desc->ld_default_stripe_count;
+               }
        }
-       if (comp->llc_stripe_size <= 0)
-               comp->llc_stripe_size = desc->ld_default_stripe_size;
+
+       lod_adjust_stripe_size(comp, desc->ld_default_stripe_size);
 }
 
 int lod_obj_for_each_stripe(const struct lu_env *env, struct lod_object *lo,
@@ -1092,10 +1176,10 @@ int lod_obj_for_each_stripe(const struct lu_env *env, struct lod_object *lo,
                            struct lod_obj_stripe_cb_data *data)
 {
        struct lod_layout_component *lod_comp;
-       int i, j, rc;
+       int i, j, rc = 0;
        ENTRY;
 
-       LASSERT(lo->ldo_comp_cnt != 0 && lo->ldo_comp_entries != NULL);
+       mutex_lock(&lo->ldo_layout_mutex);
        for (i = 0; i < lo->ldo_comp_cnt; i++) {
                lod_comp = &lo->ldo_comp_entries[i];
 
@@ -1115,7 +1199,7 @@ int lod_obj_for_each_stripe(const struct lu_env *env, struct lod_object *lo,
                if (data->locd_comp_cb) {
                        rc = data->locd_comp_cb(env, lo, i, data);
                        if (rc)
-                               RETURN(rc);
+                               GOTO(unlock, rc);
                }
 
                /* could used just to do sth about component, not each
@@ -1132,10 +1216,12 @@ int lod_obj_for_each_stripe(const struct lu_env *env, struct lod_object *lo,
                                continue;
                        rc = data->locd_stripe_cb(env, lo, dt, th, i, j, data);
                        if (rc != 0)
-                               RETURN(rc);
+                               GOTO(unlock, rc);
                }
        }
-       RETURN(0);
+unlock:
+       mutex_unlock(&lo->ldo_layout_mutex);
+       RETURN(rc);
 }
 
 static bool lod_obj_attr_set_comp_skip_cb(const struct lu_env *env,
@@ -1176,9 +1262,11 @@ static bool lod_obj_attr_set_comp_skip_cb(const struct lu_env *env,
                }
                break;
        }
+       case LCM_FL_RDONLY:
+       case LCM_FL_SYNC_PENDING:
+               break;
        default:
                LASSERTF(0, "impossible: %d\n", lo->ldo_flr_state);
-       case LCM_FL_SYNC_PENDING:
                break;
        }
 
@@ -1419,7 +1507,7 @@ static int lod_attr_set(const struct lu_env *env,
                buf->lb_len = info->lti_ea_store_size;
                lmm = info->lti_ea_store;
                magic = le32_to_cpu(lmm->lmm_magic);
-               if (magic == LOV_MAGIC_COMP_V1) {
+               if (magic == LOV_MAGIC_COMP_V1 || magic == LOV_MAGIC_SEL) {
                        struct lov_comp_md_v1 *lcm = buf->lb_buf;
                        struct lov_comp_md_entry_v1 *lcme =
                                                &lcm->lcm_entries[0];
@@ -1453,7 +1541,8 @@ static int lod_attr_set(const struct lu_env *env,
                buf->lb_buf = info->lti_ea_store;
                buf->lb_len = info->lti_ea_store_size;
                lcm = buf->lb_buf;
-               if (le32_to_cpu(lcm->lcm_magic) != LOV_MAGIC_COMP_V1)
+               if (le32_to_cpu(lcm->lcm_magic) != LOV_MAGIC_COMP_V1 &&
+                   le32_to_cpu(lcm->lcm_magic) != LOV_MAGIC_SEL)
                        RETURN(-EINVAL);
 
                le32_add_cpu(&lcm->lcm_layout_gen, 1);
@@ -1500,7 +1589,7 @@ static int lod_xattr_get(const struct lu_env *env, struct dt_object *dt,
                        RETURN(rc = rc > 0 ? -EINVAL : rc);
 
                if (buf->lb_buf == NULL || buf->lb_len == 0) {
-                       CLASSERT(sizeof(*lmv1) <= sizeof(info->lti_key));
+                       BUILD_BUG_ON(sizeof(*lmv1) > sizeof(info->lti_key));
 
                        /* lti_buf is large enough for *lmv1 or a short
                         * (<= sizeof(struct lmv_mds_md_v1)) foreign LMV
@@ -1527,10 +1616,10 @@ static int lod_xattr_get(const struct lu_env *env, struct dt_object *dt,
                        if (le32_to_cpu(lmv1->lmv_magic) == LMV_MAGIC_V1)
                                rc = lmv_mds_md_size(
                                        le32_to_cpu(lmv1->lmv_stripe_count),
-                                       LMV_MAGIC_V1);
+                                       le32_to_cpu(lmv1->lmv_magic));
                } else {
-                       lfm = buf->lb_buf;
-                       if (le32_to_cpu(lfm->lfm_magic) == LMV_MAGIC_FOREIGN)
+                       lmv1 = buf->lb_buf;
+                       if (le32_to_cpu(lmv1->lmv_magic) != LMV_MAGIC_V1)
                                RETURN(rc);
 
                        if (rc != sizeof(*lmv1))
@@ -1543,6 +1632,13 @@ static int lod_xattr_get(const struct lu_env *env, struct dt_object *dt,
                RETURN(rc = rc1 != 0 ? rc1 : rc);
        }
 
+       if ((rc > 0) && buf->lb_buf && strcmp(name, XATTR_NAME_LOV) == 0) {
+               struct lov_comp_md_v1 *lcm = buf->lb_buf;
+
+               if (lcm->lcm_magic == cpu_to_le32(LOV_MAGIC_SEL))
+                       lcm->lcm_magic = cpu_to_le32(LOV_MAGIC_COMP_V1);
+       }
+
        if (rc != -ENODATA || !S_ISDIR(dt->do_lu.lo_header->loh_attr & S_IFMT))
                RETURN(rc);
 
@@ -1559,7 +1655,7 @@ static int lod_xattr_get(const struct lu_env *env, struct dt_object *dt,
 
        if (is_root && strcmp(XATTR_NAME_LOV, name) == 0) {
                struct lov_user_md *lum = buf->lb_buf;
-               struct lov_desc    *desc = &dev->lod_desc;
+               struct lov_desc *desc = &dev->lod_ost_descs.ltd_lov_desc;
 
                if (buf->lb_buf == NULL) {
                        rc = sizeof(*lum);
@@ -1669,7 +1765,8 @@ static int lod_prep_lmv_md(const struct lu_env *env, struct dt_object *dt,
        lmm1->lmv_magic = cpu_to_le32(LMV_MAGIC);
        lmm1->lmv_stripe_count = cpu_to_le32(stripe_count);
        lmm1->lmv_hash_type = cpu_to_le32(lo->ldo_dir_hash_type);
-       if (lo->ldo_dir_hash_type & LMV_HASH_FLAG_MIGRATION) {
+       lmm1->lmv_layout_version = cpu_to_le32(lo->ldo_dir_layout_version);
+       if (lod_is_layout_changing(lo)) {
                lmm1->lmv_migrate_hash = cpu_to_le32(lo->ldo_dir_migrate_hash);
                lmm1->lmv_migrate_offset =
                        cpu_to_le32(lo->ldo_dir_migrate_offset);
@@ -1726,15 +1823,11 @@ int lod_parse_dir_striping(const struct lu_env *env, struct lod_object *lo,
                RETURN(0);
        }
 
-       if (le32_to_cpu(lmv1->lmv_magic) != LMV_MAGIC_V1)
+       if (!lmv_is_sane(lmv1))
                RETURN(-EINVAL);
 
-       if (le32_to_cpu(lmv1->lmv_stripe_count) < 1)
-               RETURN(0);
-
        LASSERT(lo->ldo_stripe == NULL);
-       OBD_ALLOC(stripe, sizeof(stripe[0]) *
-                 (le32_to_cpu(lmv1->lmv_stripe_count)));
+       OBD_ALLOC_PTR_ARRAY(stripe, le32_to_cpu(lmv1->lmv_stripe_count));
        if (stripe == NULL)
                RETURN(-ENOMEM);
 
@@ -1777,6 +1870,10 @@ out:
        lo->ldo_stripe = stripe;
        lo->ldo_dir_stripe_count = le32_to_cpu(lmv1->lmv_stripe_count);
        lo->ldo_dir_stripes_allocated = le32_to_cpu(lmv1->lmv_stripe_count);
+       lo->ldo_dir_layout_version = le32_to_cpu(lmv1->lmv_layout_version);
+       lo->ldo_dir_migrate_offset = le32_to_cpu(lmv1->lmv_migrate_offset);
+       lo->ldo_dir_migrate_hash = le32_to_cpu(lmv1->lmv_migrate_hash);
+       lo->ldo_dir_hash_type = le32_to_cpu(lmv1->lmv_hash_type);
        if (rc != 0)
                lod_striping_free_nolock(env, lo);
 
@@ -1847,31 +1944,74 @@ static int lod_dir_declare_create_stripes(const struct lu_env *env,
                if (!dto)
                        continue;
 
-               rc = lod_sub_declare_create(env, dto, attr, NULL, dof, th);
-               if (rc != 0)
-                       GOTO(out, rc);
+               /* directory split skip create for existing stripes */
+               if (!(lod_is_splitting(lo) && i < lo->ldo_dir_split_offset)) {
+                       rc = lod_sub_declare_create(env, dto, attr, NULL, dof,
+                                                   th);
+                       if (rc != 0)
+                               GOTO(out, rc);
 
-               if (!dt_try_as_dir(env, dto))
-                       GOTO(out, rc = -EINVAL);
+                       if (!dt_try_as_dir(env, dto))
+                               GOTO(out, rc = -EINVAL);
 
-               rc = lod_sub_declare_ref_add(env, dto, th);
-               if (rc != 0)
-                       GOTO(out, rc);
+                       rc = lod_sub_declare_ref_add(env, dto, th);
+                       if (rc != 0)
+                               GOTO(out, rc);
 
-               rec->rec_fid = lu_object_fid(&dto->do_lu);
-               rc = lod_sub_declare_insert(env, dto,
-                                           (const struct dt_rec *)rec,
-                                           (const struct dt_key *)dot, th);
-               if (rc != 0)
-                       GOTO(out, rc);
+                       rec->rec_fid = lu_object_fid(&dto->do_lu);
+                       rc = lod_sub_declare_insert(env, dto,
+                                                   (const struct dt_rec *)rec,
+                                                   (const struct dt_key *)dot,
+                                                   th);
+                       if (rc != 0)
+                               GOTO(out, rc);
 
-               /* master stripe FID will be put to .. */
-               rec->rec_fid = lu_object_fid(&dt->do_lu);
-               rc = lod_sub_declare_insert(env, dto,
-                                           (const struct dt_rec *)rec,
-                                           (const struct dt_key *)dotdot, th);
-               if (rc != 0)
-                       GOTO(out, rc);
+                       /* master stripe FID will be put to .. */
+                       rec->rec_fid = lu_object_fid(&dt->do_lu);
+                       rc = lod_sub_declare_insert(env, dto,
+                                                 (const struct dt_rec *)rec,
+                                                 (const struct dt_key *)dotdot,
+                                                 th);
+                       if (rc != 0)
+                               GOTO(out, rc);
+
+                       if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_BAD_SLAVE_NAME) &&
+                           cfs_fail_val == i)
+                               snprintf(stripe_name, sizeof(info->lti_key),
+                                        DFID":%u",
+                                        PFID(lu_object_fid(&dto->do_lu)),
+                                        i + 1);
+                       else
+                               snprintf(stripe_name, sizeof(info->lti_key),
+                                        DFID":%u",
+                                        PFID(lu_object_fid(&dto->do_lu)), i);
+
+                       sname = lod_name_get(env, stripe_name,
+                                            strlen(stripe_name));
+                       rc = linkea_links_new(&ldata, &info->lti_linkea_buf,
+                                             sname, lu_object_fid(&dt->do_lu));
+                       if (rc != 0)
+                               GOTO(out, rc);
+
+                       linkea_buf.lb_buf = ldata.ld_buf->lb_buf;
+                       linkea_buf.lb_len = ldata.ld_leh->leh_len;
+                       rc = lod_sub_declare_xattr_set(env, dto, &linkea_buf,
+                                                      XATTR_NAME_LINK, 0, th);
+                       if (rc != 0)
+                               GOTO(out, rc);
+
+                       rec->rec_fid = lu_object_fid(&dto->do_lu);
+                       rc = lod_sub_declare_insert(env, dt_object_child(dt),
+                                       (const struct dt_rec *)rec,
+                                       (const struct dt_key *)stripe_name, th);
+                       if (rc != 0)
+                               GOTO(out, rc);
+
+                       rc = lod_sub_declare_ref_add(env, dt_object_child(dt),
+                                                    th);
+                       if (rc != 0)
+                               GOTO(out, rc);
+               }
 
                if (!OBD_FAIL_CHECK(OBD_FAIL_LFSCK_LOST_SLAVE_LMV) ||
                    cfs_fail_val != i) {
@@ -1887,39 +2027,6 @@ static int lod_dir_declare_create_stripes(const struct lu_env *env,
                        if (rc != 0)
                                GOTO(out, rc);
                }
-
-               if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_BAD_SLAVE_NAME) &&
-                   cfs_fail_val == i)
-                       snprintf(stripe_name, sizeof(info->lti_key), DFID":%u",
-                               PFID(lu_object_fid(&dto->do_lu)), i + 1);
-               else
-                       snprintf(stripe_name, sizeof(info->lti_key), DFID":%u",
-                               PFID(lu_object_fid(&dto->do_lu)), i);
-
-               sname = lod_name_get(env, stripe_name, strlen(stripe_name));
-               rc = linkea_links_new(&ldata, &info->lti_linkea_buf,
-                                     sname, lu_object_fid(&dt->do_lu));
-               if (rc != 0)
-                       GOTO(out, rc);
-
-               linkea_buf.lb_buf = ldata.ld_buf->lb_buf;
-               linkea_buf.lb_len = ldata.ld_leh->leh_len;
-               rc = lod_sub_declare_xattr_set(env, dto, &linkea_buf,
-                                              XATTR_NAME_LINK, 0, th);
-               if (rc != 0)
-                       GOTO(out, rc);
-
-               rec->rec_fid = lu_object_fid(&dto->do_lu);
-               rc = lod_sub_declare_insert(env, dt_object_child(dt),
-                                           (const struct dt_rec *)rec,
-                                           (const struct dt_key *)stripe_name,
-                                           th);
-               if (rc != 0)
-                       GOTO(out, rc);
-
-               rc = lod_sub_declare_ref_add(env, dt_object_child(dt), th);
-               if (rc != 0)
-                       GOTO(out, rc);
        }
 
        rc = lod_sub_declare_xattr_set(env, dt_object_child(dt),
@@ -1933,74 +2040,72 @@ out:
        RETURN(rc);
 }
 
-static int lod_prep_md_striped_create(const struct lu_env *env,
-                                     struct dt_object *dt,
-                                     struct lu_attr *attr,
-                                     const struct lmv_user_md_v1 *lum,
-                                     struct dt_object_format *dof,
-                                     struct thandle *th)
+/**
+ * Allocate a striping on a predefined set of MDTs.
+ *
+ * Allocates new striping using the MDT index range provided by the data from
+ * the lum_obejcts contained in the lmv_user_md passed to this method if
+ * \a is_specific is true; or allocates new layout starting from MDT index in
+ * lo->ldo_dir_stripe_offset. The exact order of MDTs is not important and
+ * varies depending on MDT status. The number of stripes needed and stripe
+ * offset are taken from the object. If that number cannot be met, then the
+ * function returns an error and then it's the caller's responsibility to
+ * release the stripes allocated. All the internal structures are protected,
+ * but no concurrent allocation is allowed on the same objects.
+ *
+ * \param[in] env              execution environment for this thread
+ * \param[in] lo               LOD object
+ * \param[out] stripes         striping created
+ * \param[out] mdt_indices     MDT indices of striping created
+ * \param[in] is_specific      true if the MDTs are provided by lum; false if
+ *                             only the starting MDT index is provided
+ *
+ * \retval positive    stripes allocated, including the first stripe allocated
+ *                     outside
+ * \retval negative    errno on failure
+ */
+static int lod_mdt_alloc_specific(const struct lu_env *env,
+                                 struct lod_object *lo,
+                                 struct dt_object **stripes,
+                                 __u32 *mdt_indices, bool is_specific)
 {
-       struct lod_thread_info  *info = lod_env_info(env);
-       struct lod_device       *lod = lu2lod_dev(dt->do_lu.lo_dev);
-       struct lod_tgt_descs    *ltd = &lod->lod_mdt_descs;
-       struct lod_object       *lo = lod_dt_obj(dt);
-       struct dt_object        **stripe;
-       __u32                   stripe_count;
-       int                     *idx_array;
-       __u32                   master_index;
-       int                     rc = 0;
-       __u32                   i;
-       __u32                   j;
-       bool                    is_specific = false;
-       ENTRY;
-
-       /* The lum has been verifed in lod_verify_md_striping */
-       LASSERT(le32_to_cpu(lum->lum_magic) == LMV_USER_MAGIC ||
-               le32_to_cpu(lum->lum_magic) == LMV_USER_MAGIC_SPECIFIC);
-
-       stripe_count = lo->ldo_dir_stripe_count;
-
-       OBD_ALLOC(idx_array, sizeof(idx_array[0]) * stripe_count);
-       if (idx_array == NULL)
-               RETURN(-ENOMEM);
-
-       OBD_ALLOC(stripe, sizeof(stripe[0]) * stripe_count);
-       if (stripe == NULL)
-               GOTO(out_free, rc = -ENOMEM);
+       struct lod_device *lod = lu2lod_dev(lo->ldo_obj.do_lu.lo_dev);
+       struct lu_tgt_descs *ltd = &lod->lod_mdt_descs;
+       struct lu_tgt_desc *tgt = NULL;
+       struct lu_object_conf conf = { .loc_flags = LOC_F_NEW };
+       struct dt_device *tgt_dt = NULL;
+       struct lu_fid fid = { 0 };
+       struct dt_object *dto;
+       u32 master_index;
+       u32 stripe_count = lo->ldo_dir_stripe_count;
+       int stripe_idx = 1;
+       int j;
+       int idx;
+       int rc;
 
-       /* Start index must be the master MDT */
        master_index = lu_site2seq(lod2lu_dev(lod)->ld_site)->ss_node_id;
-       idx_array[0] = master_index;
-       if (le32_to_cpu(lum->lum_magic) == LMV_USER_MAGIC_SPECIFIC) {
-               is_specific = true;
-               for (i = 1; i < stripe_count; i++)
-                       idx_array[i] = le32_to_cpu(lum->lum_objects[i].lum_mds);
-       }
-
-       for (i = 0; i < stripe_count; i++) {
-               struct lod_tgt_desc     *tgt = NULL;
-               struct dt_object        *dto;
-               struct lu_fid           fid = { 0 };
-               int                     idx;
-               struct lu_object_conf   conf = { 0 };
-               struct dt_device        *tgt_dt = NULL;
+       if (!is_specific && stripe_count > 1)
+               /* Set the start index for the 2nd stripe allocation */
+               mdt_indices[1] = (mdt_indices[0] + 1) %
+                                       (lod->lod_remote_mdt_count + 1);
 
+       for (; stripe_idx < stripe_count; stripe_idx++) {
                /* Try to find next avaible target */
-               idx = idx_array[i];
+               idx = mdt_indices[stripe_idx];
                for (j = 0; j < lod->lod_remote_mdt_count;
                     j++, idx = (idx + 1) % (lod->lod_remote_mdt_count + 1)) {
                        bool already_allocated = false;
                        __u32 k;
 
                        CDEBUG(D_INFO, "try idx %d, mdt cnt %u, allocated %u\n",
-                              idx, lod->lod_remote_mdt_count + 1, i);
+                              idx, lod->lod_remote_mdt_count + 1, stripe_idx);
 
                        if (likely(!is_specific &&
                                   !OBD_FAIL_CHECK(OBD_FAIL_LARGE_STRIPE))) {
                                /* check whether the idx already exists
                                 * in current allocated array */
-                               for (k = 0; k < i; k++) {
-                                       if (idx_array[k] == idx) {
+                               for (k = 0; k < stripe_idx; k++) {
+                                       if (mdt_indices[k] == idx) {
                                                already_allocated = true;
                                                break;
                                        }
@@ -2012,38 +2117,33 @@ static int lod_prep_md_striped_create(const struct lu_env *env,
 
                        /* Sigh, this index is not in the bitmap, let's check
                         * next available target */
-                       if (!cfs_bitmap_check(ltd->ltd_tgt_bitmap, idx) &&
+                       if (!test_bit(idx, ltd->ltd_tgt_bitmap) &&
                            idx != master_index)
                                continue;
 
                        if (idx == master_index) {
                                /* Allocate the FID locally */
-                               rc = obd_fid_alloc(env, lod->lod_child_exp,
-                                                  &fid, NULL);
-                               if (rc < 0)
-                                       GOTO(out_put, rc);
                                tgt_dt = lod->lod_child;
+                               rc = dt_fid_alloc(env, tgt_dt, &fid, NULL,
+                                                 NULL);
+                               if (rc < 0)
+                                       continue;
                                break;
                        }
 
                        /* check the status of the OSP */
                        tgt = LTD_TGT(ltd, idx);
-                       if (tgt == NULL)
+                       if (!tgt)
                                continue;
 
                        tgt_dt = tgt->ltd_tgt;
-                       rc = dt_statfs(env, tgt_dt, &info->lti_osfs);
-                       if (rc) {
+                       if (!tgt->ltd_active)
                                /* this OSP doesn't feel well */
-                               rc = 0;
                                continue;
-                       }
 
-                       rc = obd_fid_alloc(env, tgt->ltd_exp, &fid, NULL);
-                       if (rc < 0) {
-                               rc = 0;
+                       rc = dt_fid_alloc(env, tgt_dt, &fid, NULL, NULL);
+                       if (rc < 0)
                                continue;
-                       }
 
                        break;
                }
@@ -2051,15 +2151,16 @@ static int lod_prep_md_striped_create(const struct lu_env *env,
                /* Can not allocate more stripes */
                if (j == lod->lod_remote_mdt_count) {
                        CDEBUG(D_INFO, "%s: require stripes %u only get %d\n",
-                              lod2obd(lod)->obd_name, stripe_count, i);
+                              lod2obd(lod)->obd_name, stripe_count,
+                              stripe_idx);
                        break;
                }
 
                CDEBUG(D_INFO, "Get idx %d, for stripe %d "DFID"\n",
-                      idx, i, PFID(&fid));
-               idx_array[i] = idx;
+                      idx, stripe_idx, PFID(&fid));
+               mdt_indices[stripe_idx] = idx;
                /* Set the start index for next stripe allocation */
-               if (!is_specific && i < stripe_count - 1) {
+               if (!is_specific && stripe_idx < stripe_count - 1) {
                        /*
                         * for large dir test, put all other slaves on one
                         * remote MDT, otherwise we may save too many local
@@ -2067,7 +2168,7 @@ static int lod_prep_md_striped_create(const struct lu_env *env,
                         */
                        if (unlikely(OBD_FAIL_CHECK(OBD_FAIL_LARGE_STRIPE)))
                                idx = master_index;
-                       idx_array[i + 1] = (idx + 1) %
+                       mdt_indices[stripe_idx + 1] = (idx + 1) %
                                           (lod->lod_remote_mdt_count + 1);
                }
                /* tgt_dt and fid must be ready after search avaible OSP
@@ -2076,47 +2177,125 @@ static int lod_prep_md_striped_create(const struct lu_env *env,
                LASSERT(fid_is_sane(&fid));
 
                /* fail a remote stripe FID allocation */
-               if (i && OBD_FAIL_CHECK(OBD_FAIL_MDS_STRIPE_FID))
+               if (stripe_idx && OBD_FAIL_CHECK(OBD_FAIL_MDS_STRIPE_FID))
                        continue;
 
-               conf.loc_flags = LOC_F_NEW;
                dto = dt_locate_at(env, tgt_dt, &fid,
-                                  dt->do_lu.lo_dev->ld_site->ls_top_dev,
-                                  &conf);
-               if (IS_ERR(dto))
-                       GOTO(out_put, rc = PTR_ERR(dto));
-               stripe[i] = dto;
+                                 lo->ldo_obj.do_lu.lo_dev->ld_site->ls_top_dev,
+                                 &conf);
+               if (IS_ERR(dto)) {
+                       rc = PTR_ERR(dto);
+                       goto error;
+               }
+
+               stripes[stripe_idx] = dto;
+       }
+
+       return stripe_idx;
+
+error:
+       for (j = 1; j < stripe_idx; j++) {
+               LASSERT(stripes[j] != NULL);
+               dt_object_put(env, stripes[j]);
+               stripes[j] = NULL;
+       }
+       return rc;
+}
+
+static int lod_prep_md_striped_create(const struct lu_env *env,
+                                     struct dt_object *dt,
+                                     struct lu_attr *attr,
+                                     const struct lmv_user_md_v1 *lum,
+                                     struct dt_object_format *dof,
+                                     struct thandle *th)
+{
+       struct lod_device *lod = lu2lod_dev(dt->do_lu.lo_dev);
+       struct lod_object *lo = lod_dt_obj(dt);
+       struct dt_object **stripes;
+       struct lu_object_conf conf = { .loc_flags = LOC_F_NEW };
+       struct lu_fid fid = { 0 };
+       __u32 stripe_count;
+       int i;
+       int rc = 0;
+
+       ENTRY;
+
+       /* The lum has been verifed in lod_verify_md_striping */
+       LASSERT(le32_to_cpu(lum->lum_magic) == LMV_USER_MAGIC ||
+               le32_to_cpu(lum->lum_magic) == LMV_USER_MAGIC_SPECIFIC);
+
+       stripe_count = lo->ldo_dir_stripe_count;
+
+       OBD_ALLOC_PTR_ARRAY(stripes, stripe_count);
+       if (!stripes)
+               RETURN(-ENOMEM);
+
+       /* Allocate the first stripe locally */
+       rc = dt_fid_alloc(env, lod->lod_child, &fid, NULL, NULL);
+       if (rc < 0)
+               GOTO(out, rc);
+
+       stripes[0] = dt_locate_at(env, lod->lod_child, &fid,
+                                 dt->do_lu.lo_dev->ld_site->ls_top_dev, &conf);
+       if (IS_ERR(stripes[0]))
+               GOTO(out, rc = PTR_ERR(stripes[0]));
+
+       if (lo->ldo_dir_stripe_offset == LMV_OFFSET_DEFAULT) {
+               lod_qos_statfs_update(env, lod, &lod->lod_mdt_descs);
+               rc = lod_mdt_alloc_qos(env, lo, stripes, 1, stripe_count);
+               if (rc == -EAGAIN)
+                       rc = lod_mdt_alloc_rr(env, lo, stripes, 1,
+                                             stripe_count);
+       } else {
+               int *idx_array;
+               bool is_specific = false;
+
+               OBD_ALLOC_PTR_ARRAY(idx_array, stripe_count);
+               if (!idx_array)
+                       GOTO(out, rc = -ENOMEM);
+
+               if (le32_to_cpu(lum->lum_magic) == LMV_USER_MAGIC_SPECIFIC) {
+                       is_specific = true;
+                       for (i = 0; i < stripe_count; i++)
+                               idx_array[i] =
+                                      le32_to_cpu(lum->lum_objects[i].lum_mds);
+               }
+
+               /* stripe 0 is local */
+               idx_array[0] =
+                       lu_site2seq(lod2lu_dev(lod)->ld_site)->ss_node_id;
+               rc = lod_mdt_alloc_specific(env, lo, stripes, idx_array,
+                                           is_specific);
+               OBD_FREE_PTR_ARRAY(idx_array, stripe_count);
        }
 
+       if (rc < 0)
+               GOTO(out, rc);
+
+       LASSERT(rc > 0);
+
        lo->ldo_dir_striped = 1;
-       lo->ldo_stripe = stripe;
-       lo->ldo_dir_stripe_count = i;
+       lo->ldo_stripe = stripes;
+       lo->ldo_dir_stripe_count = rc;
        lo->ldo_dir_stripes_allocated = stripe_count;
        smp_mb();
        lo->ldo_dir_stripe_loaded = 1;
 
-       if (lo->ldo_dir_stripe_count == 0)
-               GOTO(out_put, rc = -ENOSPC);
-
        rc = lod_dir_declare_create_stripes(env, dt, attr, dof, th);
-       if (rc != 0)
-               GOTO(out_put, rc);
+       if (rc < 0)
+               lod_striping_free(env, lo);
 
-out_put:
-       if (rc < 0) {
-               for (i = 0; i < stripe_count; i++)
-                       if (stripe[i] != NULL)
-                               dt_object_put(env, stripe[i]);
-               OBD_FREE(stripe, sizeof(stripe[0]) * stripe_count);
-               lo->ldo_dir_stripe_count = 0;
-               lo->ldo_dir_stripes_allocated = 0;
-               lo->ldo_stripe = NULL;
-       }
+       RETURN(rc);
 
-out_free:
-       OBD_FREE(idx_array, sizeof(idx_array[0]) * stripe_count);
+out:
+       LASSERT(rc < 0);
+       if (!IS_ERR_OR_NULL(stripes[0]))
+               dt_object_put(env, stripes[0]);
+       for (i = 1; i < stripe_count; i++)
+               LASSERT(!stripes[i]);
+       OBD_FREE_PTR_ARRAY(stripes, stripe_count);
 
-       RETURN(rc);
+       return rc;
 }
 
 /**
@@ -2201,281 +2380,82 @@ out:
 }
 
 /**
- * Append source stripes after target stripes for migrating directory. NB, we
- * only need to declare this, the append is done inside lod_xattr_set_lmv().
+ * Set or replace striped directory layout, and LFSCK may set layout on a plain
+ * directory, so don't check stripe count.
  *
  * \param[in] env      execution environment
  * \param[in] dt       target object
  * \param[in] buf      LMV buf which contains source stripe fids
+ * \param[in] fl       set or replace
  * \param[in] th       transaction handle
  *
  * \retval             0 on success
  * \retval             negative if failed
  */
-static int lod_dir_declare_layout_add(const struct lu_env *env,
-                                     struct dt_object *dt,
-                                     const struct lu_buf *buf,
-                                     struct thandle *th)
+static int lod_dir_layout_set(const struct lu_env *env,
+                             struct dt_object *dt,
+                             const struct lu_buf *buf,
+                             int fl,
+                             struct thandle *th)
 {
-       struct lod_thread_info *info = lod_env_info(env);
-       struct lod_device *lod = lu2lod_dev(dt->do_lu.lo_dev);
-       struct lod_tgt_descs *ltd = &lod->lod_mdt_descs;
-       struct lod_object *lo = lod_dt_obj(dt);
        struct dt_object *next = dt_object_child(dt);
-       struct dt_object_format *dof = &info->lti_format;
+       struct lod_object *lo = lod_dt_obj(dt);
+       struct lod_device *lod = lu2lod_dev(lod2lu_obj(lo)->lo_dev);
        struct lmv_mds_md_v1 *lmv = buf->lb_buf;
-       struct dt_object **stripe;
-       __u32 stripe_count = le32_to_cpu(lmv->lmv_stripe_count);
-       struct lu_fid *fid = &info->lti_fid;
-       struct lod_tgt_desc *tgt;
-       struct dt_object *dto;
-       struct dt_device *tgt_dt;
-       int type = LU_SEQ_RANGE_ANY;
-       struct dt_insert_rec *rec = &info->lti_dt_rec;
-       char *stripe_name = info->lti_key;
-       struct lu_name *sname;
-       struct linkea_data ldata = { NULL };
-       struct lu_buf linkea_buf;
-       __u32 idx;
+       struct lmv_mds_md_v1 *slave_lmv;
+       struct lu_buf slave_buf;
        int i;
        int rc;
 
        ENTRY;
 
-       if (le32_to_cpu(lmv->lmv_magic) != LMV_MAGIC_V1)
-               RETURN(-EINVAL);
-
-       if (stripe_count == 0)
+       if (!lmv_is_sane2(lmv))
                RETURN(-EINVAL);
 
-       dof->dof_type = DFT_DIR;
-
-       OBD_ALLOC(stripe,
-                 sizeof(*stripe) * (lo->ldo_dir_stripe_count + stripe_count));
-       if (stripe == NULL)
-               RETURN(-ENOMEM);
-
-       for (i = 0; i < lo->ldo_dir_stripe_count; i++)
-               stripe[i] = lo->ldo_stripe[i];
-
-       for (i = 0; i < stripe_count; i++) {
-               fid_le_to_cpu(fid,
-                       &lmv->lmv_stripe_fids[i]);
-               if (!fid_is_sane(fid))
-                       continue;
-
-               rc = lod_fld_lookup(env, lod, fid, &idx, &type);
-               if (rc)
-                       GOTO(out, rc);
-
-               if (idx == lod2lu_dev(lod)->ld_site->ld_seq_site->ss_node_id) {
-                       tgt_dt = lod->lod_child;
-               } else {
-                       tgt = LTD_TGT(ltd, idx);
-                       if (tgt == NULL)
-                               GOTO(out, rc = -ESTALE);
-                       tgt_dt = tgt->ltd_tgt;
-               }
-
-               dto = dt_locate_at(env, tgt_dt, fid,
-                                 lo->ldo_obj.do_lu.lo_dev->ld_site->ls_top_dev,
-                                 NULL);
-               if (IS_ERR(dto))
-                       GOTO(out, rc = PTR_ERR(dto));
-
-               stripe[i + lo->ldo_dir_stripe_count] = dto;
-
-               if (!dt_try_as_dir(env, dto))
-                       GOTO(out, rc = -ENOTDIR);
-
-               rc = lod_sub_declare_ref_add(env, dto, th);
-               if (rc)
-                       GOTO(out, rc);
-
-               rc = lod_sub_declare_insert(env, dto,
-                                           (const struct dt_rec *)rec,
-                                           (const struct dt_key *)dot, th);
-               if (rc)
-                       GOTO(out, rc);
-
-               rc = lod_sub_declare_insert(env, dto,
-                                           (const struct dt_rec *)rec,
-                                           (const struct dt_key *)dotdot, th);
-               if (rc)
-                       GOTO(out, rc);
-
-               rc = lod_sub_declare_xattr_set(env, dto, buf,
-                                               XATTR_NAME_LMV, 0, th);
-               if (rc)
-                       GOTO(out, rc);
-
-               snprintf(stripe_name, sizeof(info->lti_key), DFID":%u",
-                        PFID(lu_object_fid(&dto->do_lu)),
-                        i + lo->ldo_dir_stripe_count);
-
-               sname = lod_name_get(env, stripe_name, strlen(stripe_name));
-               rc = linkea_links_new(&ldata, &info->lti_linkea_buf,
-                                     sname, lu_object_fid(&dt->do_lu));
-               if (rc)
-                       GOTO(out, rc);
-
-               linkea_buf.lb_buf = ldata.ld_buf->lb_buf;
-               linkea_buf.lb_len = ldata.ld_leh->leh_len;
-               rc = lod_sub_declare_xattr_set(env, dto, &linkea_buf,
-                                              XATTR_NAME_LINK, 0, th);
-               if (rc)
-                       GOTO(out, rc);
-
-               rc = lod_sub_declare_insert(env, next,
-                                           (const struct dt_rec *)rec,
-                                           (const struct dt_key *)stripe_name,
-                                           th);
-               if (rc)
-                       GOTO(out, rc);
-
-               rc = lod_sub_declare_ref_add(env, next, th);
-               if (rc)
-                       GOTO(out, rc);
-       }
+       /* adjust hash for dir merge, which may not be set in user command */
+       if (lmv_is_merging(lmv) &&
+           !(lmv->lmv_migrate_hash & LMV_HASH_TYPE_MASK))
+               lmv->lmv_merge_hash |=
+                       lod->lod_mdt_descs.ltd_lmv_desc.ld_pattern &
+                       LMV_HASH_TYPE_MASK;
 
-       if (lo->ldo_stripe)
-               OBD_FREE(lo->ldo_stripe,
-                        sizeof(*stripe) * lo->ldo_dir_stripes_allocated);
-       lo->ldo_stripe = stripe;
-       lo->ldo_dir_migrate_offset = lo->ldo_dir_stripe_count;
-       lo->ldo_dir_migrate_hash = le32_to_cpu(lmv->lmv_hash_type);
-       lo->ldo_dir_stripe_count += stripe_count;
-       lo->ldo_dir_stripes_allocated += stripe_count;
-       lo->ldo_dir_hash_type |= LMV_HASH_FLAG_MIGRATION;
+       LMV_DEBUG(D_INFO, lmv, "set");
 
-       RETURN(0);
-out:
-       i = lo->ldo_dir_stripe_count;
-       while (i < lo->ldo_dir_stripe_count + stripe_count && stripe[i])
-               dt_object_put(env, stripe[i++]);
+       rc = lod_sub_xattr_set(env, next, buf, XATTR_NAME_LMV, fl, th);
+       if (rc)
+               RETURN(rc);
 
-       OBD_FREE(stripe,
-                sizeof(*stripe) * (stripe_count + lo->ldo_dir_stripe_count));
-       RETURN(rc);
-}
+       /* directory restripe may update stripe LMV directly */
+       if (!lo->ldo_dir_stripe_count)
+               RETURN(0);
 
-static int lod_dir_declare_layout_delete(const struct lu_env *env,
-                                        struct dt_object *dt,
-                                        const struct lu_buf *buf,
-                                        struct thandle *th)
-{
-       struct lod_thread_info *info = lod_env_info(env);
-       struct lod_object *lo = lod_dt_obj(dt);
-       struct dt_object *next = dt_object_child(dt);
-       struct lmv_user_md *lmu = buf->lb_buf;
-       __u32 final_stripe_count;
-       char *stripe_name = info->lti_key;
-       struct dt_object *dto;
-       int i;
-       int rc = 0;
+       lo->ldo_dir_hash_type = le32_to_cpu(lmv->lmv_hash_type);
+       lo->ldo_dir_migrate_offset = le32_to_cpu(lmv->lmv_migrate_offset);
+       lo->ldo_dir_migrate_hash = le32_to_cpu(lmv->lmv_migrate_hash);
+       lo->ldo_dir_layout_version = le32_to_cpu(lmv->lmv_layout_version);
 
-       if (!lmu)
-               return -EINVAL;
+       OBD_ALLOC_PTR(slave_lmv);
+       if (!slave_lmv)
+               RETURN(-ENOMEM);
 
-       final_stripe_count = le32_to_cpu(lmu->lum_stripe_count);
-       if (final_stripe_count >= lo->ldo_dir_stripe_count)
-               return -EINVAL;
+       lod_prep_slave_lmv_md(slave_lmv, lmv);
+       slave_buf.lb_buf = slave_lmv;
+       slave_buf.lb_len = sizeof(*slave_lmv);
 
-       for (i = final_stripe_count; i < lo->ldo_dir_stripe_count; i++) {
-               dto = lo->ldo_stripe[i];
-               if (!dto)
+       for (i = 0; i < lo->ldo_dir_stripe_count; i++) {
+               if (!lo->ldo_stripe[i])
                        continue;
 
-               if (!dt_try_as_dir(env, dto))
-                       return -ENOTDIR;
-
-               rc = lod_sub_declare_delete(env, dto,
-                                           (const struct dt_key *)dot, th);
-               if (rc)
-                       return rc;
-
-               rc = lod_sub_declare_ref_del(env, dto, th);
-               if (rc)
-                       return rc;
-
-               rc = lod_sub_declare_delete(env, dto,
-                                       (const struct dt_key *)dotdot, th);
-               if (rc)
-                       return rc;
-
-               snprintf(stripe_name, sizeof(info->lti_key), DFID":%d",
-                        PFID(lu_object_fid(&dto->do_lu)), i);
-
-               rc = lod_sub_declare_delete(env, next,
-                                       (const struct dt_key *)stripe_name, th);
-               if (rc)
-                       return rc;
-
-               rc = lod_sub_declare_ref_del(env, next, th);
-               if (rc)
-                       return rc;
-       }
-
-       return 0;
-}
-
-/*
- * delete stripes from dir master object, the lum_stripe_count in argument is
- * the final stripe count, the stripes after that will be deleted, NB, they
- * are not destroyed, but deleted from it's parent namespace, this function
- * will be called in two places:
- * 1. mdd_migrate_create() delete stripes from source, and append them to
- *    target.
- * 2. mdd_dir_layout_shrink() delete stripes from source, and destroy them.
- */
-static int lod_dir_layout_delete(const struct lu_env *env,
-                                struct dt_object *dt,
-                                const struct lu_buf *buf,
-                                struct thandle *th)
-{
-       struct lod_thread_info *info = lod_env_info(env);
-       struct lod_object *lo = lod_dt_obj(dt);
-       struct dt_object *next = dt_object_child(dt);
-       struct lmv_user_md *lmu = buf->lb_buf;
-       __u32 final_stripe_count;
-       char *stripe_name = info->lti_key;
-       struct dt_object *dto;
-       int i;
-       int rc = 0;
-
-       ENTRY;
-
-       if (!lmu)
-               RETURN(-EINVAL);
-
-       final_stripe_count = le32_to_cpu(lmu->lum_stripe_count);
-       if (final_stripe_count >= lo->ldo_dir_stripe_count)
-               RETURN(-EINVAL);
-
-       for (i = final_stripe_count; i < lo->ldo_dir_stripe_count; i++) {
-               dto = lo->ldo_stripe[i];
-               if (!dto)
+               if (!dt_object_exists(lo->ldo_stripe[i]))
                        continue;
 
-               rc = lod_sub_delete(env, dto,
-                                   (const struct dt_key *)dotdot, th);
-               if (rc)
-                       break;
-
-               snprintf(stripe_name, sizeof(info->lti_key), DFID":%d",
-                        PFID(lu_object_fid(&dto->do_lu)), i);
-
-               rc = lod_sub_delete(env, next,
-                                   (const struct dt_key *)stripe_name, th);
-               if (rc)
-                       break;
-
-               rc = lod_sub_ref_del(env, next, th);
+               rc = lod_sub_xattr_set(env, lo->ldo_stripe[i], &slave_buf,
+                                      XATTR_NAME_LMV, fl, th);
                if (rc)
                        break;
        }
 
-       lod_striping_free(env, lod_dt_obj(dt));
+       OBD_FREE_PTR(slave_lmv);
 
        RETURN(rc);
 }
@@ -2512,7 +2492,7 @@ static int lod_dir_declare_xattr_set(const struct lu_env *env,
                if (rc != 0)
                        RETURN(rc);
        } else if (strcmp(name, XATTR_NAME_LOV) == 0) {
-               rc = lod_verify_striping(d, lo, buf, false);
+               rc = lod_verify_striping(env, d, lo, buf, false);
                if (rc != 0)
                        RETURN(rc);
        }
@@ -2662,21 +2642,25 @@ static int lod_replace_parent_fid(const struct lu_env *env,
        RETURN(rc);
 }
 
-inline __u16 lod_comp_entry_stripe_count(struct lod_object *lo,
-                                        struct lod_layout_component *entry,
-                                        bool is_dir)
+__u16 lod_comp_entry_stripe_count(struct lod_object *lo,
+                                 int comp_idx, bool is_dir)
 {
        struct lod_device *lod = lu2lod_dev(lod2lu_obj(lo)->lo_dev);
+       struct lod_layout_component *entry;
 
        if (is_dir)
                return  0;
-       else if (lod_comp_inited(entry))
+
+       entry = &lo->ldo_comp_entries[comp_idx];
+       if (lod_comp_inited(entry))
                return entry->llc_stripe_count;
        else if ((__u16)-1 == entry->llc_stripe_count)
-               return lod->lod_desc.ld_tgt_count;
+               return lod->lod_ost_count;
        else
-               return lod_get_stripe_count(lod, lo,
-                                           entry->llc_stripe_count, false);
+               return lod_get_stripe_count(lod, lo, comp_idx,
+                                           entry->llc_stripe_count,
+                                           entry->llc_pattern &
+                                           LOV_PATTERN_OVERSTRIPING);
 }
 
 static int lod_comp_md_size(struct lod_object *lo, bool is_dir)
@@ -2712,8 +2696,7 @@ static int lod_comp_md_size(struct lod_object *lo, bool is_dir)
                __u16 stripe_count;
 
                magic = comp_entries[i].llc_pool ? LOV_MAGIC_V3 : LOV_MAGIC_V1;
-               stripe_count = lod_comp_entry_stripe_count(lo, &comp_entries[i],
-                                                          is_dir);
+               stripe_count = lod_comp_entry_stripe_count(lo, i, is_dir);
                if (!is_dir && is_composite)
                        lod_comp_shrink_stripe_count(&comp_entries[i],
                                                     &stripe_count);
@@ -2744,14 +2727,14 @@ static int lod_declare_layout_add(const struct lu_env *env,
 {
        struct lod_thread_info  *info = lod_env_info(env);
        struct lod_layout_component *comp_array, *lod_comp, *old_array;
-       struct lod_device       *d = lu2lod_dev(dt->do_lu.lo_dev);
+       struct lod_device *d = lu2lod_dev(dt->do_lu.lo_dev);
        struct dt_object *next = dt_object_child(dt);
-       struct lov_desc         *desc = &d->lod_desc;
-       struct lod_object       *lo = lod_dt_obj(dt);
-       struct lov_user_md_v3   *v3;
-       struct lov_comp_md_v1   *comp_v1 = buf->lb_buf;
-       __u32   magic;
-       int     i, rc, array_cnt, old_array_cnt;
+       struct lov_desc *desc = &d->lod_ost_descs.ltd_lov_desc;
+       struct lod_object *lo = lod_dt_obj(dt);
+       struct lov_user_md_v3 *v3;
+       struct lov_comp_md_v1 *comp_v1 = buf->lb_buf;
+       __u32 magic;
+       int i, rc, array_cnt, old_array_cnt;
        ENTRY;
 
        LASSERT(lo->ldo_is_composite);
@@ -2759,7 +2742,7 @@ static int lod_declare_layout_add(const struct lu_env *env,
        if (lo->ldo_flr_state != LCM_FL_NONE)
                RETURN(-EBUSY);
 
-       rc = lod_verify_striping(d, lo, buf, false);
+       rc = lod_verify_striping(env, d, lo, buf, false);
        if (rc != 0)
                RETURN(rc);
 
@@ -2772,10 +2755,15 @@ static int lod_declare_layout_add(const struct lu_env *env,
        if (magic != LOV_USER_MAGIC_COMP_V1)
                RETURN(-EINVAL);
 
+       mutex_lock(&lo->ldo_layout_mutex);
+
        array_cnt = lo->ldo_comp_cnt + comp_v1->lcm_entry_count;
-       OBD_ALLOC(comp_array, sizeof(*comp_array) * array_cnt);
-       if (comp_array == NULL)
+       OBD_ALLOC_PTR_ARRAY(comp_array, array_cnt);
+       if (comp_array == NULL) {
+               mutex_unlock(&lo->ldo_layout_mutex);
                RETURN(-ENOMEM);
+       }
+
 
        memcpy(comp_array, lo->ldo_comp_entries,
               sizeof(*comp_array) * lo->ldo_comp_cnt);
@@ -2796,7 +2784,7 @@ static int lod_declare_layout_add(const struct lu_env *env,
 
                lod_comp->llc_stripe_count = v1->lmm_stripe_count;
                lod_comp->llc_stripe_size = v1->lmm_stripe_size;
-               lod_adjust_stripe_info(lod_comp, desc);
+               lod_adjust_stripe_info(lod_comp, desc, 0);
 
                if (v1->lmm_magic == LOV_USER_MAGIC_V3) {
                        v3 = (struct lov_user_md_v3 *) v1;
@@ -2827,11 +2815,13 @@ static int lod_declare_layout_add(const struct lu_env *env,
                GOTO(error, rc);
        }
 
-       OBD_FREE(old_array, sizeof(*lod_comp) * old_array_cnt);
+       OBD_FREE_PTR_ARRAY(old_array, old_array_cnt);
 
        LASSERT(lo->ldo_mirror_count == 1);
        lo->ldo_mirrors[0].lme_end = array_cnt - 1;
 
+       mutex_unlock(&lo->ldo_layout_mutex);
+
        RETURN(0);
 
 error:
@@ -2843,15 +2833,55 @@ error:
                        lod_comp->llc_pool = NULL;
                }
        }
-       OBD_FREE(comp_array, sizeof(*comp_array) * array_cnt);
+       OBD_FREE_PTR_ARRAY(comp_array, array_cnt);
+       mutex_unlock(&lo->ldo_layout_mutex);
+
        RETURN(rc);
 }
 
 /**
+ * lod_last_non_stale_mirror() - Check if a mirror is the last non-stale mirror.
+ * @mirror_id: Mirror id to be checked.
+ * @lo:        LOD object.
+ *
+ * This function checks if a mirror with specified @mirror_id is the last
+ * non-stale mirror of a LOD object @lo.
+ *
+ * Return: true or false.
+ */
+static inline
+bool lod_last_non_stale_mirror(__u16 mirror_id, struct lod_object *lo)
+{
+       struct lod_layout_component *lod_comp;
+       bool has_stale_flag;
+       int i;
+
+       for (i = 0; i < lo->ldo_mirror_count; i++) {
+               if (lo->ldo_mirrors[i].lme_id == mirror_id ||
+                   lo->ldo_mirrors[i].lme_stale)
+                       continue;
+
+               has_stale_flag = false;
+               lod_foreach_mirror_comp(lod_comp, lo, i) {
+                       if (lod_comp->llc_flags & LCME_FL_STALE) {
+                               has_stale_flag = true;
+                               break;
+                       }
+               }
+               if (!has_stale_flag)
+                       return false;
+       }
+
+       return true;
+}
+
+/**
  * Declare component set. The xattr is name XATTR_LUSTRE_LOV.set.$field,
  * the '$field' can only be 'flags' now. The xattr value is binary
  * lov_comp_md_v1 which contains the component ID(s) and the value of
  * the field to be modified.
+ * Please update allowed_lustre_lov macro if $field groks more values
+ * in the future.
  *
  * \param[in] env      execution environment
  * \param[in] dt       dt_object to be modified
@@ -2877,6 +2907,9 @@ static int lod_declare_layout_set(const struct lu_env *env,
        bool    changed = false;
        ENTRY;
 
+       /* Please update allowed_lustre_lov macro if op
+        * groks more values in the future
+        */
        if (strcmp(op, "set.flags") != 0) {
                CDEBUG(D_LAYOUT, "%s: operation (%s) not supported.\n",
                       lod2obd(d)->obd_name, op);
@@ -2898,15 +2931,18 @@ static int lod_declare_layout_set(const struct lu_env *env,
                RETURN(-EINVAL);
        }
 
+       mutex_lock(&lo->ldo_layout_mutex);
        for (i = 0; i < comp_v1->lcm_entry_count; i++) {
                __u32 id = comp_v1->lcm_entries[i].lcme_id;
                __u32 flags = comp_v1->lcm_entries[i].lcme_flags;
                __u32 mirror_flag = flags & LCME_MIRROR_FLAGS;
+               __u16 mirror_id = mirror_id_of(id);
                bool neg = flags & LCME_FL_NEG;
 
                if (flags & LCME_FL_INIT) {
                        if (changed)
-                               lod_striping_free(env, lo);
+                               lod_striping_free_nolock(env, lo);
+                       mutex_unlock(&lo->ldo_layout_mutex);
                        RETURN(-EINVAL);
                }
 
@@ -2916,7 +2952,7 @@ static int lod_declare_layout_set(const struct lu_env *env,
 
                        /* lfs only put one flag in each entry */
                        if ((flags && id != lod_comp->llc_id) ||
-                           (mirror_flag && mirror_id_of(id) !=
+                           (mirror_flag && mirror_id !=
                                            mirror_id_of(lod_comp->llc_id)))
                                continue;
 
@@ -2926,8 +2962,16 @@ static int lod_declare_layout_set(const struct lu_env *env,
                                if (mirror_flag)
                                        lod_comp->llc_flags &= ~mirror_flag;
                        } else {
-                               if (flags)
+                               if (flags) {
+                                       if ((flags & LCME_FL_STALE) &&
+                                           lod_last_non_stale_mirror(mirror_id,
+                                                                     lo)) {
+                                               mutex_unlock(
+                                                       &lo->ldo_layout_mutex);
+                                               RETURN(-EUCLEAN);
+                                       }
                                        lod_comp->llc_flags |= flags;
+                               }
                                if (mirror_flag) {
                                        lod_comp->llc_flags |= mirror_flag;
                                        if (mirror_flag & LCME_FL_NOSYNC)
@@ -2938,6 +2982,7 @@ static int lod_declare_layout_set(const struct lu_env *env,
                        changed = true;
                }
        }
+       mutex_unlock(&lo->ldo_layout_mutex);
 
        if (!changed) {
                CDEBUG(D_LAYOUT, "%s: requested component(s) not found.\n",
@@ -3020,9 +3065,13 @@ static int lod_declare_layout_del(const struct lu_env *env,
                flags = 0;
        }
 
+       mutex_lock(&lo->ldo_layout_mutex);
+
        left = lo->ldo_comp_cnt;
-       if (left <= 0)
+       if (left <= 0) {
+               mutex_unlock(&lo->ldo_layout_mutex);
                RETURN(-EINVAL);
+       }
 
        for (i = (lo->ldo_comp_cnt - 1); i >= 0; i--) {
                struct lod_layout_component *lod_comp;
@@ -3039,6 +3088,7 @@ static int lod_declare_layout_del(const struct lu_env *env,
                if (left != (i + 1)) {
                        CDEBUG(D_LAYOUT, "%s: this deletion will create "
                               "a hole.\n", lod2obd(d)->obd_name);
+                       mutex_unlock(&lo->ldo_layout_mutex);
                        RETURN(-EINVAL);
                }
                left--;
@@ -3057,8 +3107,10 @@ static int lod_declare_layout_del(const struct lu_env *env,
                        if (obj == NULL)
                                continue;
                        rc = lod_sub_declare_destroy(env, obj, th);
-                       if (rc)
+                       if (rc) {
+                               mutex_unlock(&lo->ldo_layout_mutex);
                                RETURN(rc);
+                       }
                }
        }
 
@@ -3066,9 +3118,12 @@ static int lod_declare_layout_del(const struct lu_env *env,
        if (left == lo->ldo_comp_cnt) {
                CDEBUG(D_LAYOUT, "%s: requested component id:%#x not found\n",
                       lod2obd(d)->obd_name, id);
+               mutex_unlock(&lo->ldo_layout_mutex);
                RETURN(-EINVAL);
        }
 
+       mutex_unlock(&lo->ldo_layout_mutex);
+
        memset(attr, 0, sizeof(*attr));
        attr->la_valid = LA_SIZE;
        rc = lod_sub_declare_attr_set(env, next, attr, th);
@@ -3190,13 +3245,13 @@ static int lod_layout_convert(struct lod_thread_info *info)
        }
 
        lcm = info->lti_ea_store;
+       memset(lcm, 0, sizeof(*lcm) + sizeof(*lcme));
        lcm->lcm_magic = cpu_to_le32(LOV_MAGIC_COMP_V1);
        lcm->lcm_size = cpu_to_le32(size);
        lcm->lcm_layout_gen = cpu_to_le32(le16_to_cpu(
                                                lmm_save->lmm_layout_gen));
        lcm->lcm_flags = cpu_to_le16(LCM_FL_NONE);
        lcm->lcm_entry_count = cpu_to_le16(1);
-       lcm->lcm_mirror_count = 0;
 
        lcme = &lcm->lcm_entries[0];
        lcme->lcme_flags = cpu_to_le32(LCME_FL_INIT);
@@ -3221,21 +3276,25 @@ static int lod_declare_layout_merge(const struct lu_env *env,
                struct dt_object *dt, const struct lu_buf *mbuf,
                struct thandle *th)
 {
-       struct lod_thread_info  *info = lod_env_info(env);
-       struct lu_buf           *buf = &info->lti_buf;
-       struct lod_object       *lo = lod_dt_obj(dt);
-       struct lov_comp_md_v1   *lcm;
-       struct lov_comp_md_v1   *cur_lcm;
-       struct lov_comp_md_v1   *merge_lcm;
-       struct lov_comp_md_entry_v1     *lcme;
-       size_t size = 0;
-       size_t offset;
-       __u16 cur_entry_count;
+       struct lod_thread_info *info = lod_env_info(env);
+       struct lu_attr *layout_attr = &info->lti_layout_attr;
+       struct lu_buf *buf = &info->lti_buf;
+       struct lod_object *lo = lod_dt_obj(dt);
+       struct lov_comp_md_v1 *lcm;
+       struct lov_comp_md_v1 *cur_lcm;
+       struct lov_comp_md_v1 *merge_lcm;
+       struct lov_comp_md_entry_v1 *lcme;
+       struct lov_mds_md_v1 *lmm;
+       size_t size = 0;
+       size_t offset;
+       __u16 cur_entry_count;
        __u16 merge_entry_count;
        __u32 id = 0;
        __u16 mirror_id = 0;
        __u32 mirror_count;
-       int     rc, i;
+       int rc, i;
+       bool merge_has_dom;
+
        ENTRY;
 
        merge_lcm = mbuf->lb_buf;
@@ -3264,6 +3323,7 @@ static int lod_declare_layout_merge(const struct lu_env *env,
                rc = lod_layout_convert(info);
                break;
        case LOV_MAGIC_COMP_V1:
+       case LOV_MAGIC_SEL:
                rc = 0;
                break;
        default:
@@ -3318,10 +3378,17 @@ static int lod_declare_layout_merge(const struct lu_env *env,
                        lcme->lcme_id = cpu_to_le32(id);
                }
 
-               id = MAX(le32_to_cpu(lcme->lcme_id), id);
+               id = max(le32_to_cpu(lcme->lcme_id), id);
        }
 
        mirror_id = mirror_id_of(id) + 1;
+
+       /* check if first entry in new layout is DOM */
+       lmm = (struct lov_mds_md_v1 *)((char *)merge_lcm +
+                                       merge_lcm->lcm_entries[0].lcme_offset);
+       merge_has_dom = lov_pattern(le32_to_cpu(lmm->lmm_pattern)) ==
+                       LOV_PATTERN_MDT;
+
        for (i = 0; i < merge_entry_count; i++) {
                struct lov_comp_md_entry_v1 *merge_lcme;
 
@@ -3330,6 +3397,8 @@ static int lod_declare_layout_merge(const struct lu_env *env,
 
                *lcme = *merge_lcme;
                lcme->lcme_offset = cpu_to_le32(offset);
+               if (merge_has_dom && i == 0)
+                       lcme->lcme_flags |= cpu_to_le32(LCME_FL_STALE);
 
                id = pflr_id(mirror_id, i + 1);
                lcme->lcme_id = cpu_to_le32(id);
@@ -3342,8 +3411,6 @@ static int lod_declare_layout_merge(const struct lu_env *env,
        }
 
        /* fixup layout information */
-       lod_obj_inc_layout_gen(lo);
-       lcm->lcm_layout_gen = cpu_to_le32(lo->ldo_layout_gen);
        lcm->lcm_size = cpu_to_le32(size);
        lcm->lcm_entry_count = cpu_to_le16(cur_entry_count + merge_entry_count);
        lcm->lcm_mirror_count = cpu_to_le16(mirror_count);
@@ -3354,6 +3421,23 @@ static int lod_declare_layout_merge(const struct lu_env *env,
        if (rc)
                GOTO(out, rc);
 
+       lod_obj_inc_layout_gen(lo);
+       lcm->lcm_layout_gen = cpu_to_le32(lo->ldo_layout_gen);
+
+       /* transfer layout version to OST objects. */
+       if (lo->ldo_mirror_count > 1) {
+               struct lod_obj_stripe_cb_data data = { {0} };
+
+               layout_attr->la_valid = LA_LAYOUT_VERSION;
+               layout_attr->la_layout_version = 0;
+               data.locd_attr = layout_attr;
+               data.locd_declare = true;
+               data.locd_stripe_cb = lod_obj_stripe_attr_set_cb;
+               rc = lod_obj_for_each_stripe(env, lo, th, &data);
+               if (rc)
+                       GOTO(out, rc);
+       }
+
        rc = lod_sub_declare_xattr_set(env, dt_object_child(dt), buf,
                                        XATTR_NAME_LOV, LU_XATTR_REPLACE, th);
 
@@ -3369,23 +3453,231 @@ static int lod_declare_layout_split(const struct lu_env *env,
                struct dt_object *dt, const struct lu_buf *mbuf,
                struct thandle *th)
 {
+       struct lod_thread_info *info = lod_env_info(env);
+       struct lu_attr *layout_attr = &info->lti_layout_attr;
        struct lod_object *lo = lod_dt_obj(dt);
        struct lov_comp_md_v1 *lcm = mbuf->lb_buf;
        int rc;
        ENTRY;
 
-       lod_obj_inc_layout_gen(lo);
-       lcm->lcm_layout_gen = cpu_to_le32(lo->ldo_layout_gen);
-
        rc = lod_striping_reload(env, lo, mbuf);
        if (rc)
                RETURN(rc);
 
+       lod_obj_inc_layout_gen(lo);
+       /* fix on-disk layout gen */
+       lcm->lcm_layout_gen = cpu_to_le32(lo->ldo_layout_gen);
+
+
+       /* transfer layout version to OST objects. */
+       if (lo->ldo_mirror_count > 1) {
+               struct lod_obj_stripe_cb_data data = { {0} };
+
+               layout_attr->la_valid = LA_LAYOUT_VERSION;
+               layout_attr->la_layout_version = 0;
+               data.locd_attr = layout_attr;
+               data.locd_declare = true;
+               data.locd_stripe_cb = lod_obj_stripe_attr_set_cb;
+               rc = lod_obj_for_each_stripe(env, lo, th, &data);
+               if (rc)
+                       RETURN(rc);
+       }
+
        rc = lod_sub_declare_xattr_set(env, dt_object_child(dt), mbuf,
                                       XATTR_NAME_LOV, LU_XATTR_REPLACE, th);
        RETURN(rc);
 }
 
+static int lod_layout_declare_or_purge_mirror(const struct lu_env *env,
+                       struct dt_object *dt, const struct lu_buf *buf,
+                       struct thandle *th, bool declare)
+{
+       struct lod_thread_info *info = lod_env_info(env);
+       struct lod_device *d = lu2lod_dev(dt->do_lu.lo_dev);
+       struct lod_object *lo = lod_dt_obj(dt);
+       struct lov_comp_md_v1 *comp_v1 = buf->lb_buf;
+       struct lov_comp_md_entry_v1 *entry;
+       struct lov_mds_md_v1 *lmm;
+       struct dt_object **sub_objs = NULL;
+       int rc = 0, i, k, array_count = 0;
+
+       ENTRY;
+
+       /**
+        * other ops (like lod_declare_destroy) could destroying sub objects
+        * as well.
+        */
+       mutex_lock(&lo->ldo_layout_mutex);
+
+       if (!declare) {
+               /* prepare sub-objects array */
+               for (i = 0; i < comp_v1->lcm_entry_count; i++) {
+                       entry = &comp_v1->lcm_entries[i];
+
+                       if (!(entry->lcme_flags & LCME_FL_INIT))
+                               continue;
+
+                       lmm = (struct lov_mds_md_v1 *)
+                                       ((char *)comp_v1 + entry->lcme_offset);
+                       array_count += lmm->lmm_stripe_count;
+               }
+               OBD_ALLOC_PTR_ARRAY(sub_objs, array_count);
+               if (sub_objs == NULL) {
+                       mutex_unlock(&lo->ldo_layout_mutex);
+                       RETURN(-ENOMEM);
+               }
+       }
+
+       k = 0;  /* sub_objs index */
+       for (i = 0; i < comp_v1->lcm_entry_count; i++) {
+               struct lov_ost_data_v1 *objs;
+               struct lu_object *o, *n;
+               struct dt_object *dto;
+               struct lu_device *nd;
+               struct lov_mds_md_v3 *v3;
+               __u32 idx;
+               int j;
+
+               entry = &comp_v1->lcm_entries[i];
+
+               if (!(entry->lcme_flags & LCME_FL_INIT))
+                       continue;
+
+               lmm = (struct lov_mds_md_v1 *)
+                               ((char *)comp_v1 + entry->lcme_offset);
+               v3 = (struct lov_mds_md_v3 *)lmm;
+               if (lmm->lmm_magic == LOV_MAGIC_V3)
+                       objs = &v3->lmm_objects[0];
+               else
+                       objs = &lmm->lmm_objects[0];
+
+               for (j = 0; j < lmm->lmm_stripe_count; j++) {
+                       idx = objs[j].l_ost_idx;
+                       rc = ostid_to_fid(&info->lti_fid, &objs[j].l_ost_oi,
+                                         idx);
+                       if (rc)
+                               GOTO(out, rc);
+
+                       if (!fid_is_sane(&info->lti_fid)) {
+                               CERROR("%s: sub-object insane fid "DFID"\n",
+                                      lod2obd(d)->obd_name,
+                                      PFID(&info->lti_fid));
+                               GOTO(out, rc = -EINVAL);
+                       }
+
+                       lod_getref(&d->lod_ost_descs);
+
+                       rc = validate_lod_and_idx(d, idx);
+                       if (unlikely(rc)) {
+                               lod_putref(d, &d->lod_ost_descs);
+                               GOTO(out, rc);
+                       }
+
+                       nd = &OST_TGT(d, idx)->ltd_tgt->dd_lu_dev;
+                       lod_putref(d, &d->lod_ost_descs);
+
+                       o = lu_object_find_at(env, nd, &info->lti_fid, NULL);
+                       if (IS_ERR(o))
+                               GOTO(out, rc = PTR_ERR(o));
+
+                       n = lu_object_locate(o->lo_header, nd->ld_type);
+                       if (unlikely(!n)) {
+                               lu_object_put(env, n);
+                               GOTO(out, rc = -ENOENT);
+                       }
+
+                       dto = container_of(n, struct dt_object, do_lu);
+
+                       if (declare) {
+                               rc = lod_sub_declare_destroy(env, dto, th);
+                               dt_object_put(env, dto);
+                               if (rc)
+                                       GOTO(out, rc);
+                       } else {
+                               /**
+                                * collect to-be-destroyed sub objects, the
+                                * reference would be released after actual
+                                * deletion.
+                                */
+                               sub_objs[k] = dto;
+                               k++;
+                       }
+               } /* for each stripe */
+       } /* for each component in the mirror */
+out:
+       if (!declare) {
+               i = 0;
+               if (!rc) {
+                       /* destroy the sub objects */
+                       for (; i < k; i++) {
+                               rc = lod_sub_destroy(env, sub_objs[i], th);
+                               if (rc)
+                                       break;
+                               dt_object_put(env, sub_objs[i]);
+                       }
+               }
+               /**
+                * if a sub object destroy failed, we'd release sub objects
+                * reference get from above sub_objs collection.
+                */
+               for (; i < k; i++)
+                       dt_object_put(env, sub_objs[i]);
+
+               OBD_FREE_PTR_ARRAY(sub_objs, array_count);
+       }
+       mutex_unlock(&lo->ldo_layout_mutex);
+
+       RETURN(rc);
+}
+
+/**
+ * Purge layouts, delete sub objects in the mirror stored in the vic_buf,
+ * and set the LOVEA with the layout from mbuf.
+ */
+static int lod_declare_layout_purge(const struct lu_env *env,
+               struct dt_object *dt, const struct lu_buf *buf,
+               struct thandle *th)
+{
+       struct lod_device *d = lu2lod_dev(dt->do_lu.lo_dev);
+       struct lov_comp_md_v1 *comp_v1 = buf->lb_buf;
+       int rc;
+
+       ENTRY;
+
+       if (le32_to_cpu(comp_v1->lcm_magic) != LOV_MAGIC_COMP_V1) {
+               CERROR("%s: invalid layout magic %#x != %#x\n",
+                      lod2obd(d)->obd_name, le32_to_cpu(comp_v1->lcm_magic),
+                      LOV_MAGIC_COMP_V1);
+               RETURN(-EINVAL);
+       }
+
+       if (cpu_to_le32(LOV_MAGIC_COMP_V1) != LOV_MAGIC_COMP_V1)
+               lustre_swab_lov_comp_md_v1(comp_v1);
+
+       /* from now on, @buf contains cpu endian data */
+
+       if (comp_v1->lcm_mirror_count != 0) {
+               CERROR("%s: can only purge one mirror from "DFID"\n",
+                      lod2obd(d)->obd_name, PFID(lu_object_fid(&dt->do_lu)));
+               RETURN(-EINVAL);
+       }
+
+       /* delcare sub objects deletion in the mirror stored in @buf */
+       rc = lod_layout_declare_or_purge_mirror(env, dt, buf, th, true);
+       RETURN(rc);
+}
+
+/* delete sub objects from the mirror stored in @buf */
+static int lod_layout_purge(const struct lu_env *env, struct dt_object *dt,
+                           const struct lu_buf *buf, struct thandle *th)
+{
+       int rc;
+
+       ENTRY;
+       rc = lod_layout_declare_or_purge_mirror(env, dt, buf, th, false);
+       RETURN(rc);
+}
+
 /**
  * Implementation of dt_object_operations::do_declare_xattr_set.
  *
@@ -3410,7 +3702,8 @@ static int lod_declare_xattr_set(const struct lu_env *env,
 
        mode = dt->do_lu.lo_header->loh_attr & S_IFMT;
        if ((S_ISREG(mode) || mode == 0) &&
-           !(fl & (LU_XATTR_REPLACE | LU_XATTR_MERGE | LU_XATTR_SPLIT)) &&
+           !(fl & (LU_XATTR_REPLACE | LU_XATTR_MERGE | LU_XATTR_SPLIT |
+                   LU_XATTR_PURGE)) &&
            (strcmp(name, XATTR_NAME_LOV) == 0 ||
             strcmp(name, XATTR_LUSTRE_LOV) == 0)) {
                /*
@@ -3440,10 +3733,13 @@ static int lod_declare_xattr_set(const struct lu_env *env,
                LASSERT(strcmp(name, XATTR_NAME_LOV) == 0 ||
                        strcmp(name, XATTR_LUSTRE_LOV) == 0);
                rc = lod_declare_layout_split(env, dt, buf, th);
+       } else if (fl & LU_XATTR_PURGE) {
+               LASSERT(strcmp(name, XATTR_NAME_LOV) == 0 ||
+                       strcmp(name, XATTR_LUSTRE_LOV) == 0);
+               rc = lod_declare_layout_purge(env, dt, buf, th);
        } else if (S_ISREG(mode) &&
-                  strlen(name) > strlen(XATTR_LUSTRE_LOV) + 1 &&
-                  strncmp(name, XATTR_LUSTRE_LOV,
-                          strlen(XATTR_LUSTRE_LOV)) == 0) {
+                  strlen(name) >= sizeof(XATTR_LUSTRE_LOV) + 3 &&
+                  allowed_lustre_lov(name)) {
                /*
                 * this is a request to modify object's striping.
                 * add/set/del component(s).
@@ -3452,20 +3748,6 @@ static int lod_declare_xattr_set(const struct lu_env *env,
                        RETURN(-ENOENT);
 
                rc = lod_declare_modify_layout(env, dt, name, buf, th);
-       } else if (strncmp(name, XATTR_NAME_LMV, strlen(XATTR_NAME_LMV)) == 0 &&
-                  strlen(name) > strlen(XATTR_NAME_LMV) + 1) {
-               const char *op = name + strlen(XATTR_NAME_LMV) + 1;
-
-               rc = -ENOTSUPP;
-               if (strcmp(op, "add") == 0)
-                       rc = lod_dir_declare_layout_add(env, dt, buf, th);
-               else if (strcmp(op, "del") == 0)
-                       rc = lod_dir_declare_layout_delete(env, dt, buf, th);
-               else if (strcmp(op, "set") == 0)
-                       rc = lod_sub_declare_xattr_set(env, next, buf,
-                                                      XATTR_NAME_LMV, fl, th);
-
-               RETURN(rc);
        } else if (S_ISDIR(mode)) {
                rc = lod_dir_declare_xattr_set(env, dt, buf, name, fl, th);
        } else if (strcmp(name, XATTR_NAME_FID) == 0) {
@@ -3548,10 +3830,11 @@ static int lod_xattr_del_internal(const struct lu_env *env,
                                  struct dt_object *dt,
                                  const char *name, struct thandle *th)
 {
-       struct dt_object        *next = dt_object_child(dt);
-       struct lod_object       *lo = lod_dt_obj(dt);
-       int                     rc;
-       int                     i;
+       struct dt_object *next = dt_object_child(dt);
+       struct lod_object *lo = lod_dt_obj(dt);
+       int i;
+       int rc;
+
        ENTRY;
 
        rc = lod_sub_xattr_del(env, next, name, th);
@@ -3562,7 +3845,11 @@ static int lod_xattr_del_internal(const struct lu_env *env,
                RETURN(rc);
 
        for (i = 0; i < lo->ldo_dir_stripe_count; i++) {
-               LASSERT(lo->ldo_stripe[i]);
+               if (!lo->ldo_stripe[i])
+                       continue;
+
+               if (!dt_object_exists(lo->ldo_stripe[i]))
+                       continue;
 
                rc = lod_sub_xattr_del(env, lo->ldo_stripe[i], name, th);
                if (rc != 0)
@@ -3630,8 +3917,23 @@ static int lod_xattr_set_lov_on_dir(const struct lu_env *env,
                                             pool_name);
                break;
        case LOV_USER_MAGIC_COMP_V1:
+       {
+               struct lov_comp_md_v1 *lcm = (struct lov_comp_md_v1 *)lum;
+               struct lov_comp_md_entry_v1 *lcme;
+               int i, comp_cnt;
+
+               comp_cnt = le16_to_cpu(lcm->lcm_entry_count);
+               for (i = 0; i < comp_cnt; i++) {
+                       lcme = &lcm->lcm_entries[i];
+                       if (lcme->lcme_flags & cpu_to_le32(LCME_FL_EXTENSION)) {
+                               lcm->lcm_magic = cpu_to_le32(LOV_MAGIC_SEL);
+                               break;
+                       }
+               }
+
                is_del = false;
                break;
+       }
        default:
                CERROR("Invalid magic %x\n", lum->lmm_magic);
                RETURN(-EINVAL);
@@ -3688,8 +3990,7 @@ static int lod_xattr_set_default_lmv_on_dir(const struct lu_env *env,
 
        if (LMVEA_DELETE_VALUES((le32_to_cpu(lum->lum_stripe_count)),
                                 le32_to_cpu(lum->lum_stripe_offset)) &&
-           le32_to_cpu(lum->lum_magic) == LMV_USER_MAGIC &&
-           le32_to_cpu(lum->lum_hash_type) != LMV_HASH_TYPE_SPACE) {
+           le32_to_cpu(lum->lum_magic) == LMV_USER_MAGIC) {
                rc = lod_xattr_del_internal(env, dt, name, th);
                if (rc == -ENODATA)
                        rc = 0;
@@ -3757,7 +4058,7 @@ static int lod_xattr_set_lmv(const struct lu_env *env, struct dt_object *dt,
        if (rc != 0)
                RETURN(rc);
 
-       attr->la_valid = LA_ATIME | LA_MTIME | LA_CTIME |
+       attr->la_valid = LA_ATIME | LA_MTIME | LA_CTIME | LA_FLAGS |
                         LA_MODE | LA_UID | LA_GID | LA_TYPE | LA_PROJID;
        dof->dof_type = DFT_DIR;
 
@@ -3790,10 +4091,16 @@ static int lod_xattr_set_lmv(const struct lu_env *env, struct dt_object *dt,
                if (i && OBD_FAIL_CHECK(OBD_FAIL_MDS_STRIPE_CREATE))
                        continue;
 
-               /* if it's source stripe of migrating directory, don't create */
-               if (!((lo->ldo_dir_hash_type & LMV_HASH_FLAG_MIGRATION) &&
-                     i >= lo->ldo_dir_migrate_offset)) {
-                       dt_write_lock(env, dto, MOR_TGT_CHILD);
+               /* don't create stripe if:
+                * 1. it's source stripe of migrating directory
+                * 2. it's existed stripe of splitting directory
+                */
+               if ((lod_is_migrating(lo) && i >= lo->ldo_dir_migrate_offset) ||
+                   (lod_is_splitting(lo) && i < lo->ldo_dir_split_offset)) {
+                       if (!dt_object_exists(dto))
+                               GOTO(out, rc = -EINVAL);
+               } else {
+                       dt_write_lock(env, dto, DT_TGT_CHILD);
                        rc = lod_sub_create(env, dto, attr, NULL, dof, th);
                        if (rc != 0) {
                                dt_write_unlock(env, dto);
@@ -3813,12 +4120,6 @@ static int lod_xattr_set_lmv(const struct lu_env *env, struct dt_object *dt,
                                GOTO(out, rc);
                }
 
-               rec->rec_fid = lu_object_fid(&dt->do_lu);
-               rc = lod_sub_insert(env, dto, (struct dt_rec *)rec,
-                                   (const struct dt_key *)dotdot, th);
-               if (rc != 0)
-                       GOTO(out, rc);
-
                if (!OBD_FAIL_CHECK(OBD_FAIL_LFSCK_LOST_SLAVE_LMV) ||
                    cfs_fail_val != i) {
                        if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_BAD_SLAVE_LMV) &&
@@ -3830,11 +4131,26 @@ static int lod_xattr_set_lmv(const struct lu_env *env, struct dt_object *dt,
                                                        cpu_to_le32(i);
 
                        rc = lod_sub_xattr_set(env, dto, &slave_lmv_buf,
-                                              XATTR_NAME_LMV, fl, th);
+                                              XATTR_NAME_LMV, 0, th);
                        if (rc != 0)
                                GOTO(out, rc);
                }
 
+               /* don't insert stripe if it's existed stripe of splitting
+                * directory (this directory is striped).
+                * NB, plain directory will insert itself as the first
+                * stripe in target.
+                */
+               if (lod_is_splitting(lo) && lo->ldo_dir_split_offset > 1 &&
+                   lo->ldo_dir_split_offset > i)
+                       continue;
+
+               rec->rec_fid = lu_object_fid(&dt->do_lu);
+               rc = lod_sub_insert(env, dto, (struct dt_rec *)rec,
+                                   (const struct dt_key *)dotdot, th);
+               if (rc != 0)
+                       GOTO(out, rc);
+
                if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_BAD_SLAVE_NAME) &&
                    cfs_fail_val == i)
                        snprintf(stripe_name, sizeof(info->lti_key), DFID":%d",
@@ -3975,6 +4291,8 @@ static int lod_dir_striping_create_internal(const struct lu_env *env,
 
        /* Transfer default LMV striping from the parent */
        if (lds != NULL && lds->lds_dir_def_striping_set &&
+           lds->lds_dir_def_max_inherit != LMV_INHERIT_END &&
+           lds->lds_dir_def_max_inherit != LMV_INHERIT_NONE &&
            !(LMVEA_DELETE_VALUES(lds->lds_dir_def_stripe_count,
                                 lds->lds_dir_def_stripe_offset) &&
              le32_to_cpu(lds->lds_dir_def_hash_type) !=
@@ -3996,6 +4314,10 @@ static int lod_dir_striping_create_internal(const struct lu_env *env,
                        cpu_to_le32(lds->lds_dir_def_stripe_offset);
                v1->lum_hash_type =
                        cpu_to_le32(lds->lds_dir_def_hash_type);
+               v1->lum_max_inherit =
+                       lmv_inherit_next(lds->lds_dir_def_max_inherit);
+               v1->lum_max_inherit_rr =
+                       lmv_inherit_rr_next(lds->lds_dir_def_max_inherit_rr);
 
                info->lti_buf.lb_buf = v1;
                info->lti_buf.lb_len = sizeof(*v1);
@@ -4095,7 +4417,7 @@ static int lod_generate_and_set_lovea(const struct lu_env *env,
        LASSERT(lo);
 
        if (lo->ldo_comp_cnt == 0 && !lo->ldo_is_foreign) {
-               lod_striping_free(env, lo);
+               lod_striping_free_nolock(env, lo);
                rc = lod_sub_xattr_del(env, next, XATTR_NAME_LOV, th);
                RETURN(rc);
        }
@@ -4119,95 +4441,292 @@ static int lod_generate_and_set_lovea(const struct lu_env *env,
        RETURN(rc);
 }
 
+static __u32 lod_gen_component_id(struct lod_object *lo,
+                                 int mirror_id, int comp_idx);
+
 /**
- * Delete layout component(s)
+ * Repeat an existing component
+ *
+ * Creates a new layout by replicating an existing component.  Uses striping
+ * policy from previous component as a template for the striping for the new
+ * new component.
+ *
+ * New component starts with zero length, will be extended (or removed) before
+ * returning layout to client.
+ *
+ * NB: Reallocates layout components array (lo->ldo_comp_entries), invalidating
+ * any pre-existing pointers to components.  Handle with care.
  *
  * \param[in] env      execution environment for this thread
- * \param[in] dt       object
- * \param[in] th       transaction handle
+ * \param[in,out] lo   object to update the layout of
+ * \param[in] index    index of component to copy
  *
  * \retval     0 on success
- * \retval     negative error number on failure
+ * \retval     negative errno on error
  */
-static int lod_layout_del(const struct lu_env *env, struct dt_object *dt,
-                         struct thandle *th)
+static int lod_layout_repeat_comp(const struct lu_env *env,
+                                 struct lod_object *lo, int index)
 {
-       struct lod_layout_component     *lod_comp;
-       struct lod_object       *lo = lod_dt_obj(dt);
-       struct dt_object        *next = dt_object_child(dt);
-       struct lu_attr  *attr = &lod_env_info(env)->lti_attr;
-       int     rc, i, j, left;
+       struct lod_layout_component *lod_comp;
+       struct lod_layout_component *new_comp = NULL;
+       struct lod_layout_component *comp_array;
+       int rc = 0, i, new_cnt = lo->ldo_comp_cnt + 1;
+       __u16 mirror_id;
+       int offset = 0;
+       ENTRY;
 
-       LASSERT(lo->ldo_is_composite);
-       LASSERT(lo->ldo_comp_cnt > 0 && lo->ldo_comp_entries != NULL);
+       lod_comp = &lo->ldo_comp_entries[index];
+       LASSERT(lod_comp_inited(lod_comp) && lod_comp->llc_id != LCME_ID_INVAL);
 
-       left = lo->ldo_comp_cnt;
-       for (i = (lo->ldo_comp_cnt - 1); i >= 0; i--) {
-               lod_comp = &lo->ldo_comp_entries[i];
+       CDEBUG(D_LAYOUT, "repeating component %d\n", index);
 
-               if (lod_comp->llc_id != LCME_ID_INVAL)
-                       break;
-               left--;
+       OBD_ALLOC_PTR_ARRAY(comp_array, new_cnt);
+       if (comp_array == NULL)
+               GOTO(out, rc = -ENOMEM);
 
-               lod_obj_set_pool(lo, i, NULL);
-               if (lod_comp->llc_ostlist.op_array) {
-                       OBD_FREE(lod_comp->llc_ostlist.op_array,
-                                lod_comp->llc_ostlist.op_size);
-                       lod_comp->llc_ostlist.op_array = NULL;
-                       lod_comp->llc_ostlist.op_size = 0;
+       for (i = 0; i < lo->ldo_comp_cnt; i++) {
+               memcpy(&comp_array[i + offset], &lo->ldo_comp_entries[i],
+                      sizeof(*comp_array));
+
+               /* Duplicate this component in to the next slot */
+               if (i == index) {
+                       new_comp = &comp_array[i + 1];
+                       memcpy(&comp_array[i + 1], &lo->ldo_comp_entries[i],
+                              sizeof(*comp_array));
+                       /* We must now skip this new component when copying */
+                       offset = 1;
                }
+       }
 
-               /* Not instantiated component */
-               if (lod_comp->llc_stripe == NULL)
-                       continue;
-
-               LASSERT(lod_comp->llc_stripe_count > 0);
-               for (j = 0; j < lod_comp->llc_stripe_count; j++) {
-                       struct dt_object *obj = lod_comp->llc_stripe[j];
+       /* Set up copied component */
+       new_comp->llc_flags &= ~LCME_FL_INIT;
+       new_comp->llc_stripe = NULL;
+       new_comp->llc_stripes_allocated = 0;
+       new_comp->llc_ost_indices = NULL;
+       new_comp->llc_stripe_offset = LOV_OFFSET_DEFAULT;
+       /* for uninstantiated components, layout gen stores default stripe
+        * offset */
+       new_comp->llc_layout_gen = lod_comp->llc_stripe_offset;
+       /* This makes the repeated component zero-length, placed at the end of
+        * the preceding component */
+       new_comp->llc_extent.e_start = new_comp->llc_extent.e_end;
+       new_comp->llc_timestamp = lod_comp->llc_timestamp;
+       new_comp->llc_pool = NULL;
+
+       rc = lod_set_pool(&new_comp->llc_pool, lod_comp->llc_pool);
+       if (rc)
+               GOTO(out, rc);
 
-                       if (obj == NULL)
-                               continue;
-                       rc = lod_sub_destroy(env, obj, th);
-                       if (rc)
-                               GOTO(out, rc);
+       if (new_comp->llc_ostlist.op_array) {
+               __u32 *op_array = NULL;
 
-                       lu_object_put(env, &obj->do_lu);
-                       lod_comp->llc_stripe[j] = NULL;
-               }
-               OBD_FREE(lod_comp->llc_stripe, sizeof(struct dt_object *) *
-                                       lod_comp->llc_stripes_allocated);
-               lod_comp->llc_stripe = NULL;
-               OBD_FREE(lod_comp->llc_ost_indices,
-                        sizeof(__u32) * lod_comp->llc_stripes_allocated);
-               lod_comp->llc_ost_indices = NULL;
-               lod_comp->llc_stripes_allocated = 0;
+               OBD_ALLOC(op_array, new_comp->llc_ostlist.op_size);
+               if (!op_array)
+                       GOTO(out, rc = -ENOMEM);
+               memcpy(op_array, &new_comp->llc_ostlist.op_array,
+                      new_comp->llc_ostlist.op_size);
+               new_comp->llc_ostlist.op_array = op_array;
        }
 
-       LASSERTF(left >= 0 && left < lo->ldo_comp_cnt, "left = %d\n", left);
-       if (left > 0) {
-               struct lod_layout_component     *comp_array;
+       OBD_FREE_PTR_ARRAY(lo->ldo_comp_entries, lo->ldo_comp_cnt);
+       lo->ldo_comp_entries = comp_array;
+       lo->ldo_comp_cnt = new_cnt;
 
-               OBD_ALLOC(comp_array, sizeof(*comp_array) * left);
-               if (comp_array == NULL)
-                       GOTO(out, rc = -ENOMEM);
+       /* Generate an id for the new component */
+       mirror_id = mirror_id_of(new_comp->llc_id);
+       new_comp->llc_id = LCME_ID_INVAL;
+       new_comp->llc_id = lod_gen_component_id(lo, mirror_id, index + 1);
+       if (new_comp->llc_id == LCME_ID_INVAL)
+               GOTO(out, rc = -ERANGE);
 
-               memcpy(&comp_array[0], &lo->ldo_comp_entries[0],
-                      sizeof(*comp_array) * left);
+       EXIT;
+out:
+       if (rc)
+               OBD_FREE_PTR_ARRAY(comp_array, new_cnt);
 
-               OBD_FREE(lo->ldo_comp_entries,
-                        sizeof(*comp_array) * lo->ldo_comp_cnt);
-               lo->ldo_comp_entries = comp_array;
-               lo->ldo_comp_cnt = left;
+       return rc;
+}
 
-               LASSERT(lo->ldo_mirror_count == 1);
-               lo->ldo_mirrors[0].lme_end = left - 1;
-               lod_obj_inc_layout_gen(lo);
-       } else {
-               lod_free_comp_entries(lo);
-       }
+static int lod_layout_data_init(struct lod_thread_info *info, __u32 comp_cnt)
+{
+       ENTRY;
 
-       LASSERT(dt_object_exists(dt));
-       rc = dt_attr_get(env, next, attr);
+       /* clear memory region that will be used for layout change */
+       memset(&info->lti_layout_attr, 0, sizeof(struct lu_attr));
+       info->lti_count = 0;
+
+       if (info->lti_comp_size >= comp_cnt)
+               RETURN(0);
+
+       if (info->lti_comp_size > 0) {
+               OBD_FREE_PTR_ARRAY(info->lti_comp_idx, info->lti_comp_size);
+               info->lti_comp_size = 0;
+       }
+
+       OBD_ALLOC_PTR_ARRAY(info->lti_comp_idx, comp_cnt);
+       if (!info->lti_comp_idx)
+               RETURN(-ENOMEM);
+
+       info->lti_comp_size = comp_cnt;
+       RETURN(0);
+}
+
+/**
+ * Prepare new layout minus deleted components
+ *
+ * Removes components marked for deletion (LCME_ID_INVAL) by copying to a new
+ * layout and skipping those components.  Removes stripe objects if any exist.
+ *
+ * NB:
+ * Reallocates layout components array (lo->ldo_comp_entries), invalidating
+ * any pre-existing pointers to components.
+ *
+ * Caller is responsible for updating mirror end (ldo_mirror[].lme_end).
+ *
+ * \param[in] env       execution environment for this thread
+ * \param[in,out] lo    object to update the layout of
+ * \param[in] th        transaction handle for this operation
+ *
+ * \retval      # of components deleted
+ * \retval      negative errno on error
+ */
+static int lod_layout_del_prep_layout(const struct lu_env *env,
+                                     struct lod_object *lo,
+                                     struct thandle *th)
+{
+       struct lod_layout_component     *lod_comp;
+       struct lod_thread_info  *info = lod_env_info(env);
+       int rc = 0, i, j, deleted = 0;
+
+       ENTRY;
+
+       LASSERT(lo->ldo_is_composite);
+       LASSERT(lo->ldo_comp_cnt > 0 && lo->ldo_comp_entries != NULL);
+
+       rc = lod_layout_data_init(info, lo->ldo_comp_cnt);
+       if (rc)
+               RETURN(rc);
+
+       for (i = 0; i < lo->ldo_comp_cnt; i++) {
+               lod_comp = &lo->ldo_comp_entries[i];
+
+               if (lod_comp->llc_id != LCME_ID_INVAL) {
+                       /* Build array of things to keep */
+                       info->lti_comp_idx[info->lti_count++] = i;
+                       continue;
+               }
+
+               lod_obj_set_pool(lo, i, NULL);
+               if (lod_comp->llc_ostlist.op_array) {
+                       OBD_FREE(lod_comp->llc_ostlist.op_array,
+                                lod_comp->llc_ostlist.op_size);
+                       lod_comp->llc_ostlist.op_array = NULL;
+                       lod_comp->llc_ostlist.op_size = 0;
+               }
+
+               deleted++;
+               CDEBUG(D_LAYOUT, "deleting comp %d, left %d\n", i,
+                      lo->ldo_comp_cnt - deleted);
+
+               /* No striping info for this component */
+               if (lod_comp->llc_stripe == NULL)
+                       continue;
+
+               LASSERT(lod_comp->llc_stripe_count > 0);
+               for (j = 0; j < lod_comp->llc_stripe_count; j++) {
+                       struct dt_object *obj = lod_comp->llc_stripe[j];
+
+                       if (obj == NULL)
+                               continue;
+
+                       /* components which are not init have no sub objects
+                        * to destroy */
+                       if (lod_comp_inited(lod_comp)) {
+                               rc = lod_sub_destroy(env, obj, th);
+                               if (rc)
+                                       GOTO(out, rc);
+                       }
+
+                       lu_object_put(env, &obj->do_lu);
+                       lod_comp->llc_stripe[j] = NULL;
+               }
+               OBD_FREE_PTR_ARRAY(lod_comp->llc_stripe,
+                                  lod_comp->llc_stripes_allocated);
+               lod_comp->llc_stripe = NULL;
+               OBD_FREE_PTR_ARRAY(lod_comp->llc_ost_indices,
+                                  lod_comp->llc_stripes_allocated);
+               lod_comp->llc_ost_indices = NULL;
+               lod_comp->llc_stripes_allocated = 0;
+       }
+
+       /* info->lti_count has the amount of left components */
+       LASSERTF(info->lti_count >= 0 && info->lti_count < lo->ldo_comp_cnt,
+                "left = %d, lo->ldo_comp_cnt %d\n", (int)info->lti_count,
+                (int)lo->ldo_comp_cnt);
+
+       if (info->lti_count > 0) {
+               struct lod_layout_component *comp_array;
+
+               OBD_ALLOC_PTR_ARRAY(comp_array, info->lti_count);
+               if (comp_array == NULL)
+                       GOTO(out, rc = -ENOMEM);
+
+               for (i = 0; i < info->lti_count; i++) {
+                       memcpy(&comp_array[i],
+                              &lo->ldo_comp_entries[info->lti_comp_idx[i]],
+                              sizeof(*comp_array));
+               }
+
+               OBD_FREE_PTR_ARRAY(lo->ldo_comp_entries, lo->ldo_comp_cnt);
+               lo->ldo_comp_entries = comp_array;
+               lo->ldo_comp_cnt = info->lti_count;
+       } else {
+               lod_free_comp_entries(lo);
+       }
+
+       EXIT;
+out:
+       return rc ? rc : deleted;
+}
+
+/**
+ * Delete layout component(s)
+ *
+ * This function sets up the layout data in the env and does the setattrs
+ * required to write out the new layout.  The layout itself is modified in
+ * lod_layout_del_prep_layout.
+ *
+ * \param[in] env      execution environment for this thread
+ * \param[in] dt       object
+ * \param[in] th       transaction handle
+ *
+ * \retval     0 on success
+ * \retval     negative error number on failure
+ */
+static int lod_layout_del(const struct lu_env *env, struct dt_object *dt,
+                         struct thandle *th)
+{
+       struct lod_object *lo = lod_dt_obj(dt);
+       struct dt_object *next = dt_object_child(dt);
+       struct lu_attr *attr = &lod_env_info(env)->lti_attr;
+       int rc;
+
+       LASSERT(lo->ldo_mirror_count == 1);
+
+       mutex_lock(&lo->ldo_layout_mutex);
+
+       rc = lod_layout_del_prep_layout(env, lo, th);
+       if (rc < 0)
+               GOTO(out, rc);
+
+       /* Only do this if we didn't delete all components */
+       if (lo->ldo_comp_cnt > 0) {
+               lo->ldo_mirrors[0].lme_end = lo->ldo_comp_cnt - 1;
+               lod_obj_inc_layout_gen(lo);
+       }
+
+       LASSERT(dt_object_exists(dt));
+       rc = dt_attr_get(env, next, attr);
        if (rc)
                GOTO(out, rc);
 
@@ -4223,14 +4742,18 @@ static int lod_layout_del(const struct lu_env *env, struct dt_object *dt,
        EXIT;
 out:
        if (rc)
-               lod_striping_free(env, lo);
+               lod_striping_free_nolock(env, lo);
+
+       mutex_unlock(&lo->ldo_layout_mutex);
+
        return rc;
 }
 
 
 static int lod_get_default_lov_striping(const struct lu_env *env,
                                        struct lod_object *lo,
-                                       struct lod_default_striping *lds);
+                                       struct lod_default_striping *lds,
+                                       struct dt_allocation_hint *ah);
 /**
  * Implementation of dt_object_operations::do_xattr_set.
  *
@@ -4253,40 +4776,39 @@ static int lod_xattr_set(const struct lu_env *env,
                         struct dt_object *dt, const struct lu_buf *buf,
                         const char *name, int fl, struct thandle *th)
 {
-       struct dt_object        *next = dt_object_child(dt);
-       int                      rc;
+       struct dt_object *next = dt_object_child(dt);
+       struct lu_attr *layout_attr = &lod_env_info(env)->lti_layout_attr;
+       struct lod_object *lo = lod_dt_obj(dt);
+       struct lod_obj_stripe_cb_data data = { {0} };
+       int rc = 0;
+
        ENTRY;
 
        if (S_ISDIR(dt->do_lu.lo_header->loh_attr) &&
-           strcmp(name, XATTR_NAME_LMV) == 0) {
-               rc = lod_dir_striping_create(env, dt, NULL, NULL, th);
-               RETURN(rc);
-       } else if (S_ISDIR(dt->do_lu.lo_header->loh_attr) &&
-                  strncmp(name, XATTR_NAME_LMV, strlen(XATTR_NAME_LMV)) == 0 &&
-                  strlen(name) > strlen(XATTR_NAME_LMV) + 1) {
-               const char *op = name + strlen(XATTR_NAME_LMV) + 1;
-
-               rc = -ENOTSUPP;
-               /*
-                * XATTR_NAME_LMV".add" is never called, but only declared,
-                * because lod_xattr_set_lmv() will do the addition.
-                */
-               if (strcmp(op, "del") == 0)
-                       rc = lod_dir_layout_delete(env, dt, buf, th);
-               else if (strcmp(op, "set") == 0)
-                       rc = lod_sub_xattr_set(env, next, buf, XATTR_NAME_LMV,
-                                              fl, th);
+           !strcmp(name, XATTR_NAME_LMV)) {
+               switch (fl) {
+               case LU_XATTR_CREATE:
+                       rc = lod_dir_striping_create(env, dt, NULL, NULL, th);
+                       break;
+               case 0:
+               case LU_XATTR_REPLACE:
+                       rc = lod_dir_layout_set(env, dt, buf, fl, th);
+                       break;
+               default:
+                       LBUG();
+               }
 
                RETURN(rc);
        } else if (S_ISDIR(dt->do_lu.lo_header->loh_attr) &&
-           strcmp(name, XATTR_NAME_LOV) == 0) {
+                  strcmp(name, XATTR_NAME_LOV) == 0) {
                struct lod_default_striping *lds = lod_lds_buf_get(env);
                struct lov_user_md_v1 *v1 = buf->lb_buf;
                char pool[LOV_MAXPOOLNAME + 1];
                bool is_del;
 
                /* get existing striping config */
-               rc = lod_get_default_lov_striping(env, lod_dt_obj(dt), lds);
+               rc = lod_get_default_lov_striping(env, lod_dt_obj(dt), lds,
+                                                 NULL);
                if (rc)
                        RETURN(rc);
 
@@ -4340,9 +4862,9 @@ static int lod_xattr_set(const struct lu_env *env,
                                                      th);
                RETURN(rc);
        } else if (S_ISREG(dt->do_lu.lo_header->loh_attr) &&
-                  (!strcmp(name, XATTR_NAME_LOV) ||
-                   !strncmp(name, XATTR_LUSTRE_LOV,
-                            strlen(XATTR_LUSTRE_LOV)))) {
+                  (strcmp(name, XATTR_NAME_LOV) == 0 ||
+                   strcmp(name, XATTR_LUSTRE_LOV) == 0 ||
+                   allowed_lustre_lov(name))) {
                /* in case of lov EA swap, just set it
                 * if not, it is a replay so check striping match what we
                 * already have during req replay, declare_xattr_set()
@@ -4352,6 +4874,31 @@ static int lod_xattr_set(const struct lu_env *env,
                        lod_striping_free(env, lod_dt_obj(dt));
 
                        rc = lod_sub_xattr_set(env, next, buf, name, fl, th);
+               } else if (fl & LU_XATTR_SPLIT) {
+                       rc = lod_sub_xattr_set(env, next, buf, name, fl, th);
+                       if (rc)
+                               RETURN(rc);
+
+                       rc = lod_striping_reload(env, lo, buf);
+                       if (rc)
+                               RETURN(rc);
+
+                       if (lo->ldo_mirror_count > 1 &&
+                           layout_attr->la_valid & LA_LAYOUT_VERSION) {
+                               /* mirror split */
+                               layout_attr->la_layout_version =
+                                               lo->ldo_layout_gen;
+                               data.locd_attr = layout_attr;
+                               data.locd_declare = false;
+                               data.locd_stripe_cb =
+                                               lod_obj_stripe_attr_set_cb;
+                               rc = lod_obj_for_each_stripe(env, lo, th,
+                                                            &data);
+                               if (rc)
+                                       RETURN(rc);
+                       }
+               } else if (fl & LU_XATTR_PURGE) {
+                       rc = lod_layout_purge(env, dt, buf, th);
                } else if (dt_object_remote(dt)) {
                        /* This only happens during migration, see
                         * mdd_migrate_create(), in which Master MDT will
@@ -4380,6 +4927,23 @@ static int lod_xattr_set(const struct lu_env *env,
                                !lod_dt_obj(dt)->ldo_comp_cached));
 
                        rc = lod_striped_create(env, dt, NULL, NULL, th);
+                       if (rc)
+                               RETURN(rc);
+
+                       if (fl & LU_XATTR_MERGE && lo->ldo_mirror_count > 1 &&
+                           layout_attr->la_valid & LA_LAYOUT_VERSION) {
+                               /* mirror merge exec phase */
+                               layout_attr->la_layout_version =
+                                               lo->ldo_layout_gen;
+                               data.locd_attr = layout_attr;
+                               data.locd_declare = false;
+                               data.locd_stripe_cb =
+                                               lod_obj_stripe_attr_set_cb;
+                               rc = lod_obj_for_each_stripe(env, lo, th,
+                                                            &data);
+                               if (rc)
+                                       RETURN(rc);
+                       }
                }
                RETURN(rc);
        } else if (strcmp(name, XATTR_NAME_FID) == 0) {
@@ -4417,7 +4981,13 @@ static int lod_declare_xattr_del(const struct lu_env *env,
        if (!S_ISDIR(dt->do_lu.lo_header->loh_attr))
                RETURN(0);
 
-       /* set xattr to each stripes, if needed */
+       /* NB: don't delete stripe LMV, because when we do this, normally we
+        * will remove stripes, besides, if directory LMV is corrupt, this will
+        * prevent deleting its LMV and fixing it (via LFSCK).
+        */
+       if (!strcmp(name, XATTR_NAME_LMV))
+               RETURN(0);
+
        rc = lod_striping_load(env, lo);
        if (rc != 0)
                RETURN(rc);
@@ -4431,6 +5001,9 @@ static int lod_declare_xattr_del(const struct lu_env *env,
                if (!dto)
                        continue;
 
+               if (!dt_object_exists(dto))
+                       continue;
+
                rc = lod_sub_declare_xattr_del(env, dto, name, th);
                if (rc != 0)
                        break;
@@ -4450,32 +5023,14 @@ static int lod_declare_xattr_del(const struct lu_env *env,
 static int lod_xattr_del(const struct lu_env *env, struct dt_object *dt,
                         const char *name, struct thandle *th)
 {
-       struct dt_object        *next = dt_object_child(dt);
-       struct lod_object       *lo = lod_dt_obj(dt);
-       int                     rc;
-       int                     i;
+       int rc;
+
        ENTRY;
 
        if (!strcmp(name, XATTR_NAME_LOV) || !strcmp(name, XATTR_NAME_LMV))
                lod_striping_free(env, lod_dt_obj(dt));
 
-       rc = lod_sub_xattr_del(env, next, name, th);
-       if (rc != 0 || !S_ISDIR(dt->do_lu.lo_header->loh_attr))
-               RETURN(rc);
-
-       if (lo->ldo_dir_stripe_count == 0)
-               RETURN(0);
-
-       for (i = 0; i < lo->ldo_dir_stripe_count; i++) {
-               struct dt_object *dto = lo->ldo_stripe[i];
-
-               if (!dto)
-                       continue;
-
-               rc = lod_sub_xattr_del(env, dto, name, th);
-               if (rc != 0)
-                       break;
-       }
+       rc = lod_xattr_del_internal(env, dt, name, th);
 
        RETURN(rc);
 }
@@ -4556,7 +5111,8 @@ skip:
  */
 static int lod_get_default_lov_striping(const struct lu_env *env,
                                        struct lod_object *lo,
-                                       struct lod_default_striping *lds)
+                                       struct lod_default_striping *lds,
+                                       struct dt_allocation_hint *ah)
 {
        struct lod_thread_info *info = lod_env_info(env);
        struct lov_user_md_v1 *v1 = NULL;
@@ -4569,6 +5125,8 @@ static int lod_get_default_lov_striping(const struct lu_env *env,
 
        ENTRY;
 
+       lds->lds_def_striping_set = 0;
+
        rc = lod_get_lov_ea(env, lo);
        if (rc < 0)
                RETURN(rc);
@@ -4587,17 +5145,21 @@ static int lod_get_default_lov_striping(const struct lu_env *env,
                lustre_swab_lov_user_md_v3(v3);
                lustre_swab_lov_user_md_objects(v3->lmm_objects,
                                                v3->lmm_stripe_count);
-       } else if (v1->lmm_magic == __swab32(LOV_USER_MAGIC_COMP_V1)) {
+       } else if (v1->lmm_magic == __swab32(LOV_USER_MAGIC_COMP_V1) ||
+                  v1->lmm_magic == __swab32(LOV_USER_MAGIC_SEL)) {
                comp_v1 = (struct lov_comp_md_v1 *)v1;
                lustre_swab_lov_comp_md_v1(comp_v1);
        }
 
        if (v1->lmm_magic != LOV_MAGIC_V3 && v1->lmm_magic != LOV_MAGIC_V1 &&
            v1->lmm_magic != LOV_MAGIC_COMP_V1 &&
+           v1->lmm_magic != LOV_MAGIC_SEL &&
            v1->lmm_magic != LOV_USER_MAGIC_SPECIFIC)
                RETURN(-ENOTSUPP);
 
-       if (v1->lmm_magic == LOV_MAGIC_COMP_V1) {
+       if ((v1->lmm_magic == LOV_MAGIC_COMP_V1 ||
+           v1->lmm_magic == LOV_MAGIC_SEL) &&
+            !(ah && ah->dah_append_stripes)) {
                comp_v1 = (struct lov_comp_md_v1 *)v1;
                comp_cnt = comp_v1->lcm_entry_count;
                if (comp_cnt == 0)
@@ -4648,19 +5210,24 @@ static int lod_get_default_lov_striping(const struct lu_env *env,
                        RETURN(-EINVAL);
                }
 
-               CDEBUG(D_LAYOUT, DFID" stripe_count=%d stripe_size=%d "
-                      "stripe_offset=%d\n",
+               CDEBUG(D_LAYOUT, DFID" stripe_count=%d stripe_size=%d stripe_offset=%d append_stripes=%d\n",
                       PFID(lu_object_fid(&lo->ldo_obj.do_lu)),
                       (int)v1->lmm_stripe_count, (int)v1->lmm_stripe_size,
-                      (int)v1->lmm_stripe_offset);
+                      (int)v1->lmm_stripe_offset,
+                      ah ? ah->dah_append_stripes : 0);
 
-               lod_comp->llc_stripe_count = v1->lmm_stripe_count;
+               if (ah && ah->dah_append_stripes)
+                       lod_comp->llc_stripe_count = ah->dah_append_stripes;
+               else
+                       lod_comp->llc_stripe_count = v1->lmm_stripe_count;
                lod_comp->llc_stripe_size = v1->lmm_stripe_size;
                lod_comp->llc_stripe_offset = v1->lmm_stripe_offset;
                lod_comp->llc_pattern = v1->lmm_pattern;
 
                pool = NULL;
-               if (v1->lmm_magic == LOV_USER_MAGIC_V3) {
+               if (ah && ah->dah_append_pool && ah->dah_append_pool[0]) {
+                       pool = ah->dah_append_pool;
+               } else if (v1->lmm_magic == LOV_USER_MAGIC_V3) {
                        /* XXX: sanity check here */
                        v3 = (struct lov_user_md_v3 *) v1;
                        if (v3->lmm_pool_name[0] != '\0')
@@ -4718,6 +5285,8 @@ static int lod_get_default_lmv_striping(const struct lu_env *env,
                                le32_to_cpu(lmu->lum_stripe_offset);
                lds->lds_dir_def_hash_type =
                                le32_to_cpu(lmu->lum_hash_type);
+               lds->lds_dir_def_max_inherit = lmu->lum_max_inherit;
+               lds->lds_dir_def_max_inherit_rr = lmu->lum_max_inherit_rr;
                lds->lds_dir_def_striping_set = 1;
        }
 
@@ -4742,7 +5311,7 @@ static int lod_get_default_striping(const struct lu_env *env,
 {
        int rc, rc1;
 
-       rc = lod_get_default_lov_striping(env, lo, lds);
+       rc = lod_get_default_lov_striping(env, lo, lds, NULL);
        rc1 = lod_get_default_lmv_striping(env, lo, lds);
        if (rc == 0 && rc1 < 0)
                rc = rc1;
@@ -4765,10 +5334,11 @@ static void lod_striping_from_default(struct lod_object *lo,
                                      umode_t mode)
 {
        struct lod_device *d = lu2lod_dev(lo->ldo_obj.do_lu.lo_dev);
-       struct lov_desc *desc = &d->lod_desc;
        int i, rc;
 
        if (lds->lds_def_striping_set && S_ISREG(mode)) {
+               struct lov_desc *desc = &d->lod_ost_descs.ltd_lov_desc;
+
                rc = lod_alloc_comp_entries(lo, lds->lds_def_mirror_cnt,
                                            lds->lds_def_comp_cnt);
                if (rc != 0)
@@ -4825,7 +5395,7 @@ static void lod_striping_from_default(struct lod_object *lo,
                        if (!lo->ldo_is_composite)
                                continue;
 
-                       lod_adjust_stripe_info(obj_comp, desc);
+                       lod_adjust_stripe_info(obj_comp, desc, 0);
                }
        } else if (lds->lds_dir_def_striping_set && S_ISDIR(mode)) {
                if (lo->ldo_dir_stripe_count == 0)
@@ -4837,13 +5407,6 @@ static void lod_striping_from_default(struct lod_object *lo,
                if (lo->ldo_dir_hash_type == 0)
                        lo->ldo_dir_hash_type = lds->lds_dir_def_hash_type;
 
-               /*
-                * "space" hash type can only be set in default LMV, child use
-                * FNV_1A_64 in case it's striped.
-                */
-               if (lo->ldo_dir_hash_type == LMV_HASH_TYPE_SPACE)
-                       lo->ldo_dir_hash_type = LMV_HASH_TYPE_FNV_1A_64;
-
                CDEBUG(D_LAYOUT, "striping from default dir: count:%hu, "
                       "offset:%u, hash_type:%u\n",
                       lo->ldo_dir_stripe_count, lo->ldo_dir_stripe_offset,
@@ -4851,7 +5414,8 @@ static void lod_striping_from_default(struct lod_object *lo,
        }
 }
 
-static inline bool lod_need_inherit_more(struct lod_object *lo, bool from_root)
+static inline bool lod_need_inherit_more(struct lod_object *lo, bool from_root,
+                                        char *append_pool)
 {
        struct lod_layout_component *lod_comp;
 
@@ -4871,6 +5435,9 @@ static inline bool lod_need_inherit_more(struct lod_object *lo, bool from_root)
                          lod_comp->llc_stripe_offset == LOV_OFFSET_DEFAULT))
                return true;
 
+       if (append_pool && append_pool[0])
+               return true;
+
        return false;
 }
 
@@ -4905,6 +5472,10 @@ static void lod_ah_init(const struct lu_env *env,
 
        LASSERT(child);
 
+       if (ah->dah_append_stripes == -1)
+               ah->dah_append_stripes =
+                       d->lod_ost_descs.ltd_lov_desc.ld_tgt_count;
+
        if (likely(parent)) {
                nextp = dt_object_child(parent);
                lp = lod_dt_obj(parent);
@@ -4943,12 +5514,20 @@ static void lod_ah_init(const struct lu_env *env,
                 * If parent object is not root directory,
                 * then get default striping from parent object.
                 */
-               if (likely(lp != NULL) && !fid_is_root(lod_object_fid(lp)))
+               if (likely(lp != NULL)) {
                        lod_get_default_striping(env, lp, lds);
-
-               /* set child default striping info, default value is NULL */
-               if (lds->lds_def_striping_set || lds->lds_dir_def_striping_set)
-                       lc->ldo_def_striping = lds;
+                       if (lds->lds_def_striping_set) {
+                               rc = lod_verify_striping(env, d, lp,
+                                                        &info->lti_buf, false);
+                               if (rc)
+                                       lds->lds_def_striping_set = 0;
+                       }
+                       /* inherit default striping except ROOT */
+                       if ((lds->lds_def_striping_set ||
+                            lds->lds_dir_def_striping_set) &&
+                           !fid_is_root(lod_object_fid(lp)))
+                               lc->ldo_def_striping = lds;
+               }
 
                /* It should always honour the specified stripes */
                /* Note: old client (< 2.7)might also do lfs mkdir, whose EA
@@ -4986,6 +5565,10 @@ static void lod_ah_init(const struct lu_env *env,
                                lc->ldo_dir_stripe_count = 0;
                }
 
+               if (!(lc->ldo_dir_hash_type & LMV_HASH_TYPE_MASK))
+                       lc->ldo_dir_hash_type |=
+                               d->lod_mdt_descs.ltd_lmv_desc.ld_pattern;
+
                CDEBUG(D_INFO, "final dir stripe [%hu %d %u]\n",
                       lc->ldo_dir_stripe_count,
                       (int)lc->ldo_dir_stripe_offset, lc->ldo_dir_hash_type);
@@ -5006,9 +5589,13 @@ static void lod_ah_init(const struct lu_env *env,
         * Try from the parent first.
         */
        if (likely(lp != NULL)) {
-               rc = lod_get_default_lov_striping(env, lp, lds);
-               if (rc == 0)
-                       lod_striping_from_default(lc, lds, child_mode);
+               rc = lod_get_default_lov_striping(env, lp, lds, ah);
+               if (rc == 0 && lds->lds_def_striping_set) {
+                       rc = lod_verify_striping(env, d, lp, &info->lti_buf,
+                                                false);
+                       if (rc == 0)
+                               lod_striping_from_default(lc, lds, child_mode);
+               }
        }
 
        /* Initialize lod_device::lod_md_root object reference */
@@ -5034,10 +5621,18 @@ static void lod_ah_init(const struct lu_env *env,
         *  - parent has plain(v1/v3) default layout, and some attributes
         *    are not specified in the default layout;
         */
-       if (d->lod_md_root != NULL && lod_need_inherit_more(lc, true)) {
-               rc = lod_get_default_lov_striping(env, d->lod_md_root, lds);
+       if (d->lod_md_root != NULL &&
+           lod_need_inherit_more(lc, true, ah->dah_append_pool)) {
+               rc = lod_get_default_lov_striping(env, d->lod_md_root, lds,
+                                                 ah);
+               if (rc || !lds->lds_def_striping_set)
+                       goto out;
+
+               rc = lod_verify_striping(env, d, d->lod_md_root, &info->lti_buf,
+                                        false);
                if (rc)
                        goto out;
+
                if (lc->ldo_comp_cnt == 0) {
                        lod_striping_from_default(lc, lds, child_mode);
                } else if (!lds->lds_def_striping_is_composite) {
@@ -5066,7 +5661,7 @@ out:
         * fs default striping may not be explicitly set, or historically set
         * in config log, use them.
         */
-       if (lod_need_inherit_more(lc, false)) {
+       if (lod_need_inherit_more(lc, false, ah->dah_append_pool)) {
                if (lc->ldo_comp_cnt == 0) {
                        rc = lod_alloc_comp_entries(lc, 0, 1);
                        if (rc)
@@ -5079,14 +5674,15 @@ out:
                }
                LASSERT(!lc->ldo_is_composite);
                lod_comp = &lc->ldo_comp_entries[0];
-               desc = &d->lod_desc;
-               lod_adjust_stripe_info(lod_comp, desc);
+               desc = &d->lod_ost_descs.ltd_lov_desc;
+               lod_adjust_stripe_info(lod_comp, desc, ah->dah_append_stripes);
+               if (ah->dah_append_pool && ah->dah_append_pool[0])
+                       lod_obj_set_pool(lc, 0, ah->dah_append_pool);
        }
 
        EXIT;
 }
 
-#define ll_do_div64(aaa,bbb)    do_div((aaa), (bbb))
 /**
  * Size initialization on late striping.
  *
@@ -5150,14 +5746,13 @@ static int lod_declare_init_size(const struct lu_env *env,
                                continue;
 
                        LASSERT(objects != NULL && stripe_size != 0);
-                       /* ll_do_div64(a, b) returns a % b, and a = a / b */
-                       ll_do_div64(size, (__u64)stripe_size);
-                       stripe = ll_do_div64(size, (__u64)stripe_count);
+                       do_div(size, stripe_size);
+                       stripe = do_div(size, stripe_count);
                        LASSERT(objects[stripe] != NULL);
 
                        size = size * stripe_size;
                        offs = attr->la_size;
-                       size += ll_do_div64(offs, stripe_size);
+                       size += do_div(offs, stripe_size);
 
                        attr->la_valid = LA_SIZE;
                        attr->la_size = size;
@@ -5244,14 +5839,29 @@ out:
        RETURN(rc);
 }
 
-static inline int dt_object_space_hashed(const struct lu_env *env,
-                                        struct lu_device *dev,
-                                        struct dt_object *dt)
+/*
+ * Whether subdirectories under \a dt should be created on MDTs by space QoS
+ *
+ * If LMV_HASH_FLAG_SPACE is set on directory default layout, its subdirectories
+ * should be created on MDT by space QoS.
+ *
+ * \param[in] env      execution environment
+ * \param[in] dev      lu device
+ * \param[in] dt       object
+ *
+ * \retval             1 if directory should create subdir by space usage
+ * \retval             0 if not
+ * \retval             -ev if failed
+ */
+static inline int dt_object_qos_mkdir(const struct lu_env *env,
+                                     struct lu_device *dev,
+                                     struct dt_object *dt)
 {
+       struct lod_thread_info *info = lod_env_info(env);
        struct lu_object *obj;
        struct lod_object *lo;
        struct lmv_user_md *lmu;
-       int rc = 0;
+       int rc;
 
        obj = lu_object_find_slice(env, dev, lu_object_fid(&dt->do_lu), NULL);
        if (IS_ERR(obj))
@@ -5260,18 +5870,15 @@ static inline int dt_object_space_hashed(const struct lu_env *env,
        lo = lu2lod_obj(obj);
 
        rc = lod_get_default_lmv_ea(env, lo);
-       if (rc < 0)
+       dt_object_put(env, dt);
+       if (rc <= 0)
                return rc;
 
-       if (rc >= (int)sizeof(*lmu)) {
-               struct lod_thread_info *info = lod_env_info(env);
-
-               lmu = info->lti_ea_store;
-               rc = le32_to_cpu(lmu->lum_hash_type) == LMV_HASH_TYPE_SPACE;
-       }
-       dt_object_put(env, dt);
+       if (rc < (int)sizeof(*lmu))
+               return -EINVAL;
 
-       return rc;
+       lmu = info->lti_ea_store;
+       return le32_to_cpu(lmu->lum_stripe_offset) == LMV_OFFSET_DEFAULT;
 }
 
 /**
@@ -5337,32 +5944,15 @@ static int lod_declare_create(const struct lu_env *env, struct dt_object *dt,
                        if (OBD_FAIL_CHECK(OBD_FAIL_MDS_STALE_DIR_LAYOUT))
                                GOTO(out, rc = -EREMOTE);
 
-                       if (lo->ldo_dir_stripe_offset == -1) {
-                               /*
-                                * child and parent should be in the same MDT,
-                                * but if parent has plain layout, it's allowed.
-                                */
-                               if (hint->dah_parent &&
-                                   dt_object_remote(hint->dah_parent)) {
-                                       rc = dt_object_space_hashed(env,
-                                                      lo->ldo_obj.do_lu.lo_dev,
-                                                      hint->dah_parent);
-                                       if (rc <= 0)
-                                               GOTO(out, rc ? rc : -EREMOTE);
-                               }
-                       } else if (lo->ldo_dir_stripe_offset !=
-                                  ss->ss_node_id) {
+                       if (lo->ldo_dir_stripe_offset != LMV_OFFSET_DEFAULT &&
+                           lo->ldo_dir_stripe_offset != ss->ss_node_id) {
                                struct lod_device *lod;
-                               struct lod_tgt_descs *ltd;
-                               struct lod_tgt_desc *tgt = NULL;
+                               struct lu_tgt_desc *mdt = NULL;
                                bool found_mdt = false;
-                               int i;
 
                                lod = lu2lod_dev(lo->ldo_obj.do_lu.lo_dev);
-                               ltd = &lod->lod_mdt_descs;
-                               cfs_foreach_bit(ltd->ltd_tgt_bitmap, i) {
-                                       tgt = LTD_TGT(ltd, i);
-                                       if (tgt->ltd_index ==
+                               lod_foreach_mdt(lod, mdt) {
+                                       if (mdt->ltd_index ==
                                                lo->ldo_dir_stripe_offset) {
                                                found_mdt = true;
                                                break;
@@ -5471,6 +6061,8 @@ int lod_striped_create(const struct lu_env *env, struct dt_object *dt,
        int     rc = 0, i, j;
        ENTRY;
 
+       mutex_lock(&lo->ldo_layout_mutex);
+
        LASSERT((lo->ldo_comp_cnt != 0 && lo->ldo_comp_entries != NULL) ||
                lo->ldo_is_foreign);
 
@@ -5529,15 +6121,20 @@ int lod_striped_create(const struct lu_env *env, struct dt_object *dt,
        if (rc)
                GOTO(out, rc);
 
+       lo->ldo_comp_cached = 1;
+
        rc = lod_generate_and_set_lovea(env, lo, th);
        if (rc)
                GOTO(out, rc);
 
-       lo->ldo_comp_cached = 1;
+       mutex_unlock(&lo->ldo_layout_mutex);
+
        RETURN(0);
 
 out:
-       lod_striping_free(env, lo);
+       lod_striping_free_nolock(env, lo);
+       mutex_unlock(&lo->ldo_layout_mutex);
+
        RETURN(rc);
 }
 
@@ -5597,11 +6194,12 @@ lod_obj_stripe_destroy_cb(const struct lu_env *env, struct lod_object *lo,
 {
        if (data->locd_declare)
                return lod_sub_declare_destroy(env, dt, th);
-       else if (!OBD_FAIL_CHECK(OBD_FAIL_LFSCK_LOST_SPEOBJ) ||
-                stripe_idx == cfs_fail_val)
+
+       if (!OBD_FAIL_CHECK(OBD_FAIL_LFSCK_LOST_SPEOBJ) ||
+           stripe_idx == cfs_fail_val)
                return lod_sub_destroy(env, dt, th);
-       else
-               return 0;
+
+       return 0;
 }
 
 /**
@@ -5780,7 +6378,7 @@ static int lod_destroy(const struct lu_env *env, struct dt_object *dt,
 
                        if (!OBD_FAIL_CHECK(OBD_FAIL_LFSCK_LOST_SPEOBJ) ||
                            i == cfs_fail_val) {
-                               dt_write_lock(env, stripe, MOR_TGT_CHILD);
+                               dt_write_lock(env, stripe, DT_TGT_CHILD);
                                rc = lod_sub_ref_del(env, stripe, th);
                                dt_write_unlock(env, stripe);
                                if (rc != 0)
@@ -6014,57 +6612,587 @@ static int lod_invalidate(const struct lu_env *env, struct dt_object *dt)
        return dt_invalidate(env, dt_object_child(dt));
 }
 
-static int lod_layout_data_init(struct lod_thread_info *info, __u32 comp_cnt)
+static int lod_declare_instantiate_components(const struct lu_env *env,
+                                             struct lod_object *lo,
+                                             struct thandle *th,
+                                             __u64 reserve)
 {
+       struct lod_thread_info *info = lod_env_info(env);
+       int i;
+       int rc = 0;
        ENTRY;
 
-       /* clear memory region that will be used for layout change */
-       memset(&info->lti_layout_attr, 0, sizeof(struct lu_attr));
-       info->lti_count = 0;
+       LASSERT(info->lti_count < lo->ldo_comp_cnt);
 
-       if (info->lti_comp_size >= comp_cnt)
-               RETURN(0);
+       for (i = 0; i < info->lti_count; i++) {
+               rc = lod_qos_prep_create(env, lo, NULL, th,
+                                        info->lti_comp_idx[i], reserve);
+               if (rc)
+                       break;
+       }
 
-       if (info->lti_comp_size > 0) {
-               OBD_FREE(info->lti_comp_idx,
-                        info->lti_comp_size * sizeof(__u32));
-               info->lti_comp_size = 0;
+       if (!rc) {
+               info->lti_buf.lb_len = lod_comp_md_size(lo, false);
+               rc = lod_sub_declare_xattr_set(env, lod_object_child(lo),
+                               &info->lti_buf, XATTR_NAME_LOV, 0, th);
        }
 
-       OBD_ALLOC(info->lti_comp_idx, comp_cnt * sizeof(__u32));
-       if (!info->lti_comp_idx)
-               RETURN(-ENOMEM);
+       RETURN(rc);
+}
 
-       info->lti_comp_size = comp_cnt;
-       RETURN(0);
+/**
+ * Check OSTs for an existing component for further extension
+ *
+ * Checks if OSTs are still healthy and not out of space.  Gets free space
+ * on OSTs (relative to allocation watermark rmb_low) and compares to
+ * the proposed new_end for this component.
+ *
+ * Decides whether or not to extend a component on its current OSTs.
+ *
+ * \param[in] env              execution environment for this thread
+ * \param[in] lo               object we're checking
+ * \param[in] index            index of this component
+ * \param[in] extension_size   extension size for this component
+ * \param[in] extent           layout extent for requested operation
+ * \param[in] comp_extent      extension component extent
+ * \param[in] write            if this is write operation
+ *
+ * \retval     true - OK to extend on current OSTs
+ * \retval     false - do not extend on current OSTs
+ */
+static bool lod_sel_osts_allowed(const struct lu_env *env,
+                                struct lod_object *lo,
+                                int index, __u64 reserve,
+                                struct lu_extent *extent,
+                                struct lu_extent *comp_extent, int write)
+{
+       struct lod_layout_component *lod_comp = &lo->ldo_comp_entries[index];
+       struct lod_device *lod = lu2lod_dev(lo->ldo_obj.do_lu.lo_dev);
+       struct lod_thread_info *tinfo = lod_env_info(env);
+       struct obd_statfs *sfs = &tinfo->lti_osfs;
+       __u64 available = 0;
+       bool ret = true;
+       int i, rc;
+
+       ENTRY;
+
+       LASSERT(lod_comp->llc_stripe_count != 0);
+
+       lod_getref(&lod->lod_ost_descs);
+       for (i = 0; i < lod_comp->llc_stripe_count; i++) {
+               int index = lod_comp->llc_ost_indices[i];
+               struct lod_tgt_desc *ost = OST_TGT(lod, index);
+               struct obd_statfs_info info = { 0 };
+               int j, repeated = 0;
+
+               LASSERT(ost);
+
+               /* Get the number of times this OST repeats in this component.
+                * Note: inter-component repeats are not counted as this is
+                * considered as a rare case: we try to not repeat OST in other
+                * components if possible. */
+               for (j = 0; j < lod_comp->llc_stripe_count; j++) {
+                       if (index != lod_comp->llc_ost_indices[j])
+                               continue;
+
+                       /* already handled */
+                       if (j < i)
+                               break;
+
+                       repeated++;
+               }
+               if (j < lod_comp->llc_stripe_count)
+                       continue;
+
+               if (!test_bit(index, lod->lod_ost_bitmap)) {
+                       CDEBUG(D_LAYOUT, "ost %d no longer present\n", index);
+                       ret = false;
+                       break;
+               }
+
+               rc = dt_statfs_info(env, ost->ltd_tgt, sfs, &info);
+               if (rc) {
+                       CDEBUG(D_LAYOUT, "statfs failed for ost %d, error %d\n",
+                              index, rc);
+                       ret = false;
+                       break;
+               }
+
+               if (sfs->os_state & OS_STATFS_ENOSPC ||
+                   sfs->os_state & OS_STATFS_READONLY ||
+                   sfs->os_state & OS_STATFS_DEGRADED) {
+                       CDEBUG(D_LAYOUT, "ost %d is not availble for SEL "
+                              "extension, state %u\n", index, sfs->os_state);
+                       ret = false;
+                       break;
+               }
+
+               /* In bytes */
+               available = sfs->os_bavail * sfs->os_bsize;
+               /* 'available' is relative to the allocation threshold */
+               available -= (__u64) info.os_reserved_mb_low << 20;
+
+               CDEBUG(D_LAYOUT, "ost %d lowwm: %d highwm: %d, "
+                      "%llu %% blocks available, %llu %% blocks free\n",
+                      index, info.os_reserved_mb_low, info.os_reserved_mb_high,
+                      (100ull * sfs->os_bavail) / sfs->os_blocks,
+                      (100ull * sfs->os_bfree) / sfs->os_blocks);
+
+               if (reserve * repeated > available) {
+                       ret = false;
+                       CDEBUG(D_LAYOUT, "low space on ost %d, available %llu "
+                              "< extension size %llu repeated %d\n", index,
+                              available, reserve, repeated);
+                       break;
+               }
+       }
+       lod_putref(lod, &lod->lod_ost_descs);
+
+       RETURN(ret);
 }
 
-static int lod_declare_instantiate_components(const struct lu_env *env,
-               struct lod_object *lo, struct thandle *th)
+/**
+ * Adjust extents after component removal
+ *
+ * When we remove an extension component, we move the start of the next
+ * component to match the start of the extension component, so no space is left
+ * without layout.
+ *
+ * \param[in] env      execution environment for this thread
+ * \param[in] lo       object
+ * \param[in] max_comp layout component
+ * \param[in] index    index of this component
+ *
+ * \retval             0 on success
+ * \retval             negative errno on error
+ */
+static void lod_sel_adjust_extents(const struct lu_env *env,
+                                  struct lod_object *lo,
+                                  int max_comp, int index)
+{
+       struct lod_layout_component *lod_comp = NULL;
+       struct lod_layout_component *next = NULL;
+       struct lod_layout_component *prev = NULL;
+       __u64 new_start = 0;
+       __u64 start;
+       int i;
+
+       /* Extension space component */
+       lod_comp = &lo->ldo_comp_entries[index];
+       next = &lo->ldo_comp_entries[index + 1];
+       prev = &lo->ldo_comp_entries[index - 1];
+
+       LASSERT(lod_comp != NULL && prev != NULL && next != NULL);
+       LASSERT(lod_comp->llc_flags & LCME_FL_EXTENSION);
+
+       /* Previous is being removed */
+       if (prev && prev->llc_id == LCME_ID_INVAL)
+               new_start = prev->llc_extent.e_start;
+       else
+               new_start = lod_comp->llc_extent.e_start;
+
+       for (i = index + 1; i < max_comp; i++) {
+               lod_comp = &lo->ldo_comp_entries[i];
+
+               start = lod_comp->llc_extent.e_start;
+               lod_comp->llc_extent.e_start = new_start;
+
+               /* We only move zero length extendable components */
+               if (!(start == lod_comp->llc_extent.e_end))
+                       break;
+
+               LASSERT(!(lod_comp->llc_flags & LCME_FL_INIT));
+
+               lod_comp->llc_extent.e_end = new_start;
+       }
+}
+
+/* Calculate the proposed 'new end' for a component we're extending */
+static __u64 lod_extension_new_end(__u64 extension_size, __u64 extent_end,
+                                  __u32 stripe_size, __u64 component_end,
+                                  __u64 extension_end)
+{
+       __u64 new_end;
+
+       LASSERT(extension_size != 0 && stripe_size != 0);
+
+       /* Round up to extension size */
+       if (extent_end == OBD_OBJECT_EOF) {
+               new_end = OBD_OBJECT_EOF;
+       } else {
+               /* Add at least extension_size to the previous component_end,
+                * covering the req layout extent */
+               new_end = max(extent_end - component_end, extension_size);
+               new_end = roundup(new_end, extension_size);
+               new_end += component_end;
+
+               /* Component end must be min stripe size aligned */
+               if (new_end % stripe_size) {
+                       CDEBUG(D_LAYOUT, "new component end is not aligned "
+                              "by the stripe size %u: [%llu, %llu) ext size "
+                              "%llu new end %llu, aligning\n",
+                              stripe_size, component_end, extent_end,
+                              extension_size, new_end);
+                       new_end = roundup(new_end, stripe_size);
+               }
+
+               /* Overflow */
+               if (new_end < extent_end)
+                       new_end = OBD_OBJECT_EOF;
+       }
+
+       /* Don't extend past the end of the extension component */
+       if (new_end > extension_end)
+               new_end = extension_end;
+
+       return new_end;
+}
+
+/**
+ * Calculate the exact reservation (per-OST extension_size) on the OSTs being
+ * instantiated. It needs to be calculated in advance and taken into account at
+ * the instantiation time, because otherwise lod_statfs_and_check() may consider
+ * an OST as OK, but SEL needs its extension_size to fit the free space and the
+ * OST may turn out to be low-on-space, thus inappropriate OST may be used and
+ * ENOSPC occurs.
+ *
+ * \param[in] lod_comp         lod component we are checking
+ *
+ * \retval     size to reserved on each OST of lod_comp's stripe.
+ */
+static __u64 lod_sel_stripe_reserved(struct lod_layout_component *lod_comp)
+{
+       /* extension_size is file level, so we must divide by stripe count to
+        * compare it to available space on a single OST */
+       return  lod_comp->llc_stripe_size * SEL_UNIT_SIZE /
+               lod_comp->llc_stripe_count;
+}
+
+/* As lod_sel_handler() could be re-entered for the same component several
+ * times, this is the data for the next call. Fields could be changed to
+ * component indexes when needed, (e.g. if there is no need to instantiate
+ * all the previous components up to the current position) to tell the caller
+ * where to start over from. */
+struct sel_data {
+       int sd_force;
+       int sd_repeat;
+};
+
+/**
+ * Process extent updates for a particular layout component
+ *
+ * Handle layout updates for a particular extension space component touched by
+ * a layout update operation.  Core function of self-extending PFL feature.
+ *
+ * In general, this function processes exactly *one* stage of an extension
+ * operation, modifying the layout accordingly, then returns to the caller.
+ * The caller is responsible for restarting processing with the new layout,
+ * which may repeatedly return to this function until the extension updates
+ * are complete.
+ *
+ * This function does one of a few things to the layout:
+ * 1. Extends the component before the current extension space component to
+ * allow it to accomodate the requested operation (if space/policy permit that
+ * component to continue on its current OSTs)
+ *
+ * 2. If extension of the existing component fails, we do one of two things:
+ *    a. If there is a component after the extension space, we remove the
+ *       extension space component, move the start of the next component down
+ *       accordingly, then notify the caller to restart processing w/the new
+ *       layout.
+ *    b. If there is no following component, we try repeating the current
+ *       component, creating a new component using the current one as a
+ *       template (keeping its stripe properties but not specific striping),
+ *       and try assigning striping for this component.  If there is sufficient
+ *       free space on the OSTs chosen for this component, it is instantiated
+ *       and i/o continues there.
+ *
+ *       If there is not sufficient space on the new OSTs, we remove this new
+ *       component & extend the current component.
+ *
+ * Note further that uninited components followed by extension space can be zero
+ * length meaning that we will try to extend them before initializing them, and
+ * if that fails, they will be removed without initialization.
+ *
+ * 3. If we extend to/beyond the end of an extension space component, that
+ * component is exhausted (all of its range has been given to real components),
+ * so we remove it and restart processing.
+ *
+ * \param[in] env              execution environment for this thread
+ * \param[in,out] lo           object to update the layout of
+ * \param[in] extent           layout extent for requested operation, update
+ *                             layout to fit this operation
+ * \param[in] th               transaction handle for this operation
+ * \param[in,out] max_comp     the highest comp for the portion of the layout
+ *                             we are operating on (For FLR, the chosen
+ *                             replica).  Updated because we may remove
+ *                             components.
+ * \param[in] index            index of the extension space component we're
+ *                             working on
+ * \param[in] write            if this is write op
+ * \param[in,out] force                if the extension is to be forced; set here
+                               to force it on the 2nd call for the same
+                               extension component
+ *
+ * \retval     0 on success
+ * \retval     negative errno on error
+ */
+static int lod_sel_handler(const struct lu_env *env,
+                         struct lod_object *lo,
+                         struct lu_extent *extent,
+                         struct thandle *th, int *max_comp,
+                         int index, int write,
+                         struct sel_data *sd)
 {
+       struct lod_device *d = lu2lod_dev(lo->ldo_obj.do_lu.lo_dev);
        struct lod_thread_info *info = lod_env_info(env);
-       int i;
+       struct lod_layout_component *lod_comp;
+       struct lod_layout_component *prev;
+       struct lod_layout_component *next = NULL;
+       __u64 extension_size, reserve;
+       __u64 new_end = 0;
+       bool repeated;
+       int change = 0;
        int rc = 0;
        ENTRY;
 
-       LASSERT(info->lti_count < lo->ldo_comp_cnt);
+       /* First component cannot be extension space */
+       if (index == 0) {
+               CERROR("%s: "DFID" first component cannot be extension space\n",
+                      lod2obd(d)->obd_name, PFID(lod_object_fid(lo)));
+               RETURN(-EINVAL);
+       }
 
-       for (i = 0; i < info->lti_count; i++) {
-               rc = lod_qos_prep_create(env, lo, NULL, th,
-                                        info->lti_comp_idx[i]);
-               if (rc)
+       lod_comp = &lo->ldo_comp_entries[index];
+       prev = &lo->ldo_comp_entries[index - 1];
+       if ((index + 1) < *max_comp)
+               next = &lo->ldo_comp_entries[index + 1];
+
+       /* extension size uses the stripe size field as KiB */
+       extension_size = lod_comp->llc_stripe_size * SEL_UNIT_SIZE;
+
+       CDEBUG(D_LAYOUT, "prev start %llu, extension start %llu, extension end"
+              " %llu, extension size %llu\n", prev->llc_extent.e_start,
+              lod_comp->llc_extent.e_start, lod_comp->llc_extent.e_end,
+              extension_size);
+
+       /* Two extension space components cannot be adjacent & extension space
+        * components cannot be init */
+       if ((prev->llc_flags & LCME_FL_EXTENSION) ||
+           !(ergo(next, !(next->llc_flags & LCME_FL_EXTENSION))) ||
+            lod_comp_inited(lod_comp)) {
+               CERROR("%s: "DFID" invalid extension space components\n",
+                      lod2obd(d)->obd_name, PFID(lod_object_fid(lo)));
+               RETURN(-EINVAL);
+       }
+
+       reserve = lod_sel_stripe_reserved(lod_comp);
+
+       if (!prev->llc_stripe) {
+               CDEBUG(D_LAYOUT, "Previous component not inited\n");
+               info->lti_count = 1;
+               info->lti_comp_idx[0] = index - 1;
+               rc = lod_declare_instantiate_components(env, lo, th, reserve);
+               /* ENOSPC tells us we can't use this component.  If there is
+                * a next or we are repeating, we either spill over (next) or
+                * extend the original comp (repeat).  Otherwise, return the
+                * error to the user. */
+               if (rc == -ENOSPC && (next || sd->sd_repeat))
+                       rc = 1;
+               if (rc < 0)
+                       RETURN(rc);
+       }
+
+       if (sd->sd_force == 0 && rc == 0)
+               rc = !lod_sel_osts_allowed(env, lo, index - 1, reserve, extent,
+                                          &lod_comp->llc_extent, write);
+
+       repeated = !!(sd->sd_repeat);
+       sd->sd_repeat = 0;
+       sd->sd_force = 0;
+
+       /* Extend previous component */
+       if (rc == 0) {
+               new_end = lod_extension_new_end(extension_size, extent->e_end,
+                                               prev->llc_stripe_size,
+                                               prev->llc_extent.e_end,
+                                               lod_comp->llc_extent.e_end);
+
+               CDEBUG(D_LAYOUT, "new end %llu\n", new_end);
+               lod_comp->llc_extent.e_start = new_end;
+               prev->llc_extent.e_end = new_end;
+
+               if (prev->llc_extent.e_end == lod_comp->llc_extent.e_end) {
+                       CDEBUG(D_LAYOUT, "Extension component exhausted\n");
+                       lod_comp->llc_id = LCME_ID_INVAL;
+                       change--;
+               }
+       } else {
+               /* rc == 1, failed to extend current component */
+               LASSERT(rc == 1);
+               if (next) {
+                       /* Normal 'spillover' case - Remove the extension
+                        * space component & bring down the start of the next
+                        * component. */
+                       lod_comp->llc_id = LCME_ID_INVAL;
+                       change--;
+                       if (!(prev->llc_flags & LCME_FL_INIT)) {
+                               prev->llc_id = LCME_ID_INVAL;
+                               change--;
+                       }
+                       lod_sel_adjust_extents(env, lo, *max_comp, index);
+               } else if (lod_comp_inited(prev)) {
+                       /* If there is no next, and the previous component is
+                        * INIT'ed, try repeating the previous component. */
+                       LASSERT(repeated == 0);
+                       rc = lod_layout_repeat_comp(env, lo, index - 1);
+                       if (rc < 0)
+                               RETURN(rc);
+                       change++;
+                       /* The previous component is a repeated component.
+                        * Record this so we don't keep trying to repeat it. */
+                       sd->sd_repeat = 1;
+               } else {
+                       /* If the previous component is not INIT'ed, this may
+                        * be a component we have just instantiated but failed
+                        * to extend. Or even a repeated component we failed
+                        * to prepare a striping for. Do not repeat but instead
+                        * remove the repeated component & force the extention
+                        * of the original one */
+                       sd->sd_force = 1;
+                       if (repeated) {
+                               prev->llc_id = LCME_ID_INVAL;
+                               change--;
+                       }
+               }
+       }
+
+       if (change < 0) {
+               rc = lod_layout_del_prep_layout(env, lo, NULL);
+               if (rc < 0)
+                       RETURN(rc);
+               LASSERTF(-rc == change,
+                        "number deleted %d != requested %d\n", -rc,
+                        change);
+       }
+       *max_comp = *max_comp + change;
+
+       /* lod_del_prep_layout reallocates ldo_comp_entries, so we must
+        * refresh these pointers before using them */
+       lod_comp = &lo->ldo_comp_entries[index];
+       prev = &lo->ldo_comp_entries[index - 1];
+       CDEBUG(D_LAYOUT, "After extent updates: prev start %llu, current start "
+              "%llu, current end %llu max_comp %d ldo_comp_cnt %d\n",
+              prev->llc_extent.e_start, lod_comp->llc_extent.e_start,
+              lod_comp->llc_extent.e_end, *max_comp, lo->ldo_comp_cnt);
+
+       /* Layout changed successfully */
+       RETURN(0);
+}
+
+/**
+ * Declare layout extent updates
+ *
+ * Handles extensions.  Identifies extension components touched by current
+ * operation and passes them to processing function.
+ *
+ * Restarts with updated layouts from the processing function until the current
+ * operation no longer touches an extension space component.
+ *
+ * \param[in] env      execution environment for this thread
+ * \param[in,out] lo   object to update the layout of
+ * \param[in] extent   layout extent for requested operation, update layout to
+ *                     fit this operation
+ * \param[in] th       transaction handle for this operation
+ * \param[in] pick     identifies chosen mirror for FLR layouts
+ * \param[in] write    if this is write op
+ *
+ * \retval     1 on layout changed, 0 on no change
+ * \retval     negative errno on error
+ */
+static int lod_declare_update_extents(const struct lu_env *env,
+               struct lod_object *lo, struct lu_extent *extent,
+               struct thandle *th, int pick, int write)
+{
+       struct lod_thread_info *info = lod_env_info(env);
+       struct lod_layout_component *lod_comp;
+       bool layout_changed = false;
+       struct sel_data sd = { 0 };
+       int start_index;
+       int i = 0;
+       int max_comp = 0;
+       int rc = 0, rc2;
+       int change = 0;
+       ENTRY;
+
+       /* This makes us work on the components of the chosen mirror */
+       start_index = lo->ldo_mirrors[pick].lme_start;
+       max_comp = lo->ldo_mirrors[pick].lme_end + 1;
+       if (lo->ldo_flr_state == LCM_FL_NONE)
+               LASSERT(start_index == 0 && max_comp == lo->ldo_comp_cnt);
+
+       CDEBUG(D_LAYOUT, "extent->e_start %llu, extent->e_end %llu\n",
+              extent->e_start, extent->e_end);
+       for (i = start_index; i < max_comp; i++) {
+               lod_comp = &lo->ldo_comp_entries[i];
+
+               /* We've passed all components of interest */
+               if (lod_comp->llc_extent.e_start >= extent->e_end)
                        break;
+
+               if (lod_comp->llc_flags & LCME_FL_EXTENSION) {
+                       layout_changed = true;
+                       rc = lod_sel_handler(env, lo, extent, th, &max_comp,
+                                            i, write, &sd);
+                       if (rc < 0)
+                               GOTO(out, rc);
+
+                       /* Nothing has changed behind the prev one */
+                       i -= 2;
+                       continue;
+               }
        }
 
-       if (!rc) {
-               info->lti_buf.lb_len = lod_comp_md_size(lo, false);
-               rc = lod_sub_declare_xattr_set(env, lod_object_child(lo),
-                               &info->lti_buf, XATTR_NAME_LOV, 0, th);
+       /* We may have added or removed components.  If so, we must update the
+        * start & ends of all the mirrors after the current one, and the end
+        * of the current mirror. */
+       change = max_comp - 1 - lo->ldo_mirrors[pick].lme_end;
+       if (change) {
+               lo->ldo_mirrors[pick].lme_end += change;
+               for (i = pick + 1; i < lo->ldo_mirror_count; i++) {
+                       lo->ldo_mirrors[i].lme_start += change;
+                       lo->ldo_mirrors[i].lme_end += change;
+               }
        }
 
-       RETURN(rc);
+       EXIT;
+out:
+       /* The amount of components has changed, adjust the lti_comp_idx */
+       rc2 = lod_layout_data_init(info, lo->ldo_comp_cnt);
+
+       return rc < 0 ? rc : rc2 < 0 ? rc2 : layout_changed;
 }
 
+/* If striping is already instantiated or INIT'ed DOM? */
+static bool lod_is_instantiation_needed(struct lod_layout_component *comp)
+{
+       return !(((lov_pattern(comp->llc_pattern) == LOV_PATTERN_MDT) &&
+                 lod_comp_inited(comp)) || comp->llc_stripe);
+}
+
+/**
+ * Declare layout update for a non-FLR layout.
+ *
+ * \param[in] env      execution environment for this thread
+ * \param[in,out] lo   object to update the layout of
+ * \param[in] layout   layout intent for requested operation, "update" is
+ *                     a process of reacting to this
+ * \param[in] buf      buffer containing lov ea (see comment on usage inline)
+ * \param[in] th       transaction handle for this operation
+ *
+ * \retval     0 on success
+ * \retval     negative errno on error
+ */
 static int lod_declare_update_plain(const struct lu_env *env,
                struct lod_object *lo, struct layout_intent *layout,
                const struct lu_buf *buf, struct thandle *th)
@@ -6073,6 +7201,7 @@ static int lod_declare_update_plain(const struct lu_env *env,
        struct lod_device *d = lu2lod_dev(lo->ldo_obj.do_lu.lo_dev);
        struct lod_layout_component *lod_comp;
        struct lov_comp_md_v1 *comp_v1 = NULL;
+       bool layout_changed = false;
        bool replay = false;
        int i, rc;
        ENTRY;
@@ -6108,6 +7237,11 @@ static int lod_declare_update_plain(const struct lu_env *env,
                /* old on-disk EA is stored in info->lti_buf */
                comp_v1 = (struct lov_comp_md_v1 *)info->lti_buf.lb_buf;
                replay = true;
+               layout_changed = true;
+
+               rc = lod_layout_data_init(info, lo->ldo_comp_cnt);
+               if (rc)
+                       GOTO(out, rc);
        } else {
                /* non replay path */
                rc = lod_striping_load(env, lo);
@@ -6120,18 +7254,27 @@ static int lod_declare_update_plain(const struct lu_env *env,
        if (lo->ldo_comp_cnt > 1 &&
            lod_comp->llc_extent.e_end != OBD_OBJECT_EOF &&
            lod_comp->llc_extent.e_end < layout->li_extent.e_end) {
-               CDEBUG(replay ? D_ERROR : D_LAYOUT,
-                      "%s: the defined layout [0, %#llx) does not covers "
-                      "the write range "DEXT"\n",
-                      lod2obd(d)->obd_name, lod_comp->llc_extent.e_end,
-                      PEXT(&layout->li_extent));
+               CDEBUG_LIMIT(replay ? D_ERROR : D_LAYOUT,
+                            "%s: the defined layout [0, %#llx) does not "
+                            "covers the write range "DEXT"\n",
+                            lod2obd(d)->obd_name, lod_comp->llc_extent.e_end,
+                            PEXT(&layout->li_extent));
                GOTO(out, rc = -EINVAL);
        }
 
-       CDEBUG(D_LAYOUT, "%s: "DFID": instantiate components "DEXT"\n",
+       CDEBUG(D_LAYOUT, "%s: "DFID": update components "DEXT"\n",
               lod2obd(d)->obd_name, PFID(lod_object_fid(lo)),
               PEXT(&layout->li_extent));
 
+       if (!replay) {
+               rc = lod_declare_update_extents(env, lo, &layout->li_extent,
+                               th, 0, layout->li_opc == LAYOUT_INTENT_WRITE);
+               if (rc < 0)
+                       GOTO(out, rc);
+               else if (rc)
+                       layout_changed = true;
+       }
+
        /*
         * Iterate ld->ldo_comp_entries, find the component whose extent under
         * the write range and not instantianted.
@@ -6143,7 +7286,8 @@ static int lod_declare_update_plain(const struct lu_env *env,
                        break;
 
                if (!replay) {
-                       if (lod_comp_inited(lod_comp))
+                       /* If striping is instantiated or INIT'ed DOM skip */
+                       if (!lod_is_instantiation_needed(lod_comp))
                                continue;
                } else {
                        /**
@@ -6167,17 +7311,19 @@ static int lod_declare_update_plain(const struct lu_env *env,
 
                LASSERT(info->lti_comp_idx != NULL);
                info->lti_comp_idx[info->lti_count++] = i;
+               layout_changed = true;
        }
 
-       if (info->lti_count == 0)
+       if (!layout_changed)
                RETURN(-EALREADY);
 
        lod_obj_inc_layout_gen(lo);
-       rc = lod_declare_instantiate_components(env, lo, th);
+       rc = lod_declare_instantiate_components(env, lo, th, 0);
+       EXIT;
 out:
        if (rc)
                lod_striping_free(env, lo);
-       RETURN(rc);
+       return rc;
 }
 
 static inline int lod_comp_index(struct lod_object *lo,
@@ -6192,15 +7338,21 @@ static inline int lod_comp_index(struct lod_object *lo,
 /**
  * Stale other mirrors by writing extent.
  */
-static void lod_stale_components(struct lod_object *lo, int primary,
-                                struct lu_extent *extent)
+static int lod_stale_components(const struct lu_env *env, struct lod_object *lo,
+                               int primary, struct lu_extent *extent,
+                               struct thandle *th)
 {
        struct lod_layout_component *pri_comp, *lod_comp;
+       struct lu_extent pri_extent;
+       int rc = 0;
        int i;
+       ENTRY;
 
        /* The writing extent decides which components in the primary
         * are affected... */
        CDEBUG(D_LAYOUT, "primary mirror %d, "DEXT"\n", primary, PEXT(extent));
+
+restart:
        lod_foreach_mirror_comp(pri_comp, lo, primary) {
                if (!lu_extent_is_overlapped(extent, &pri_comp->llc_extent))
                        continue;
@@ -6209,15 +7361,27 @@ static void lod_stale_components(struct lod_object *lo, int primary,
                       lod_comp_index(lo, pri_comp),
                       PEXT(&pri_comp->llc_extent));
 
+               pri_extent.e_start = pri_comp->llc_extent.e_start;
+               pri_extent.e_end = pri_comp->llc_extent.e_end;
+
                for (i = 0; i < lo->ldo_mirror_count; i++) {
                        if (i == primary)
                                continue;
+                       rc = lod_declare_update_extents(env, lo, &pri_extent,
+                                                       th, i, 0);
+                       /* if update_extents changed the layout, it may have
+                        * reallocated the component array, so start over to
+                        * avoid using stale pointers */
+                       if (rc == 1)
+                               goto restart;
+                       if (rc < 0)
+                               RETURN(rc);
 
                        /* ... and then stale other components that are
                         * overlapping with primary components */
                        lod_foreach_mirror_comp(lod_comp, lo, i) {
                                if (!lu_extent_is_overlapped(
-                                                       &pri_comp->llc_extent,
+                                                       &pri_extent,
                                                        &lod_comp->llc_extent))
                                        continue;
 
@@ -6229,6 +7393,8 @@ static void lod_stale_components(struct lod_object *lo, int primary,
                        }
                }
        }
+
+       RETURN(rc);
 }
 
 /**
@@ -6262,8 +7428,8 @@ static inline int lod_check_ost_avail(const struct lu_env *env,
 
        ost = OST_TGT(lod, idx);
        if (ost->ltd_statfs.os_state &
-               (OS_STATE_READONLY | OS_STATE_ENOSPC | OS_STATE_ENOINO |
-                OS_STATE_NOPRECREATE) ||
+               (OS_STATFS_READONLY | OS_STATFS_ENOSPC | OS_STATFS_ENOINO |
+                OS_STATFS_NOPRECREATE) ||
            ost->ltd_active == 0) {
                CDEBUG(D_LAYOUT, DFID ": mirror %d OST%d unavail, rc = %d\n",
                       PFID(lod_object_fid(lo)), index, idx, rc);
@@ -6300,7 +7466,12 @@ static int lod_primary_pick(const struct lu_env *env, struct lod_object *lo,
         * This algo can be revised later after knowing the topology of
         * cluster.
         */
-       lod_qos_statfs_update(env, lod);
+       lod_qos_statfs_update(env, lod, &lod->lod_ost_descs);
+
+       rc = lod_fill_mirrors(lo);
+       if (rc)
+               RETURN(rc);
+
        for (i = 0; i < lo->ldo_mirror_count; i++) {
                bool ost_avail = true;
                int index = (i + seq) % lo->ldo_mirror_count;
@@ -6312,7 +7483,7 @@ static int lod_primary_pick(const struct lu_env *env, struct lod_object *lo,
                }
 
                /* 2nd pick is for the primary mirror containing unavail OST */
-               if (lo->ldo_mirrors[index].lme_primary && second_pick < 0)
+               if (lo->ldo_mirrors[index].lme_prefer && second_pick < 0)
                        second_pick = index;
 
                /* 3rd pick is for non-primary mirror containing unavail OST */
@@ -6323,7 +7494,7 @@ static int lod_primary_pick(const struct lu_env *env, struct lod_object *lo,
                 * we found a non-primary 1st pick, we'd like to find a
                 * potential pirmary mirror.
                 */
-               if (picked >= 0 && !lo->ldo_mirrors[index].lme_primary)
+               if (picked >= 0 && !lo->ldo_mirrors[index].lme_prefer)
                        continue;
 
                /* check the availability of OSTs */
@@ -6360,7 +7531,7 @@ static int lod_primary_pick(const struct lu_env *env, struct lod_object *lo,
                 * primary with all OSTs are available, this is the perfect
                 * 1st pick.
                 */
-               if (lo->ldo_mirrors[index].lme_primary)
+               if (lo->ldo_mirrors[index].lme_prefer)
                        break;
        } /* for all mirrors */
 
@@ -6464,6 +7635,7 @@ static int lod_declare_update_rdonly(const struct lu_env *env,
 
        if (mlc->mlc_opc == MD_LAYOUT_WRITE) {
                struct layout_intent *layout = mlc->mlc_intent;
+               int write = layout->li_opc == LAYOUT_INTENT_WRITE;
                int picked;
 
                extent = layout->li_extent;
@@ -6478,6 +7650,12 @@ static int lod_declare_update_rdonly(const struct lu_env *env,
                       PFID(lod_object_fid(lo)),
                       lo->ldo_mirrors[picked].lme_id);
 
+               /* Update extents of primary before staling */
+               rc = lod_declare_update_extents(env, lo, &extent, th, picked,
+                                               write);
+               if (rc < 0)
+                       GOTO(out, rc);
+
                if (layout->li_opc == LAYOUT_INTENT_TRUNC) {
                        /**
                         * trunc transfers [0, size) in the intent extent, we'd
@@ -6488,7 +7666,9 @@ static int lod_declare_update_rdonly(const struct lu_env *env,
                }
 
                /* stale overlapping components from other mirrors */
-               lod_stale_components(lo, picked, &extent);
+               rc = lod_stale_components(env, lo, picked, &extent, th);
+               if (rc < 0)
+                       GOTO(out, rc);
 
                /* restore truncate intent extent */
                if (layout->li_opc == LAYOUT_INTENT_TRUNC)
@@ -6502,7 +7682,7 @@ static int lod_declare_update_rdonly(const struct lu_env *env,
                                                     &lod_comp->llc_extent))
                                break;
 
-                       if (lod_comp_inited(lod_comp))
+                       if (!lod_is_instantiation_needed(lod_comp))
                                continue;
 
                        info->lti_comp_idx[info->lti_count++] =
@@ -6560,7 +7740,7 @@ static int lod_declare_update_rdonly(const struct lu_env *env,
                lo->ldo_layout_gen = layout_version & 0xffff;
        }
 
-       rc = lod_declare_instantiate_components(env, lo, th);
+       rc = lod_declare_instantiate_components(env, lo, th, 0);
        if (rc)
                GOTO(out, rc);
 
@@ -6595,22 +7775,29 @@ static int lod_declare_update_write_pending(const struct lu_env *env,
        LASSERT(mlc->mlc_opc == MD_LAYOUT_WRITE ||
                mlc->mlc_opc == MD_LAYOUT_RESYNC);
 
-       /* look for the primary mirror */
+       /* look for the first preferred mirror */
        for (i = 0; i < lo->ldo_mirror_count; i++) {
                if (lo->ldo_mirrors[i].lme_stale)
                        continue;
-
-               LASSERTF(primary < 0, DFID " has multiple primary: %u / %u",
-                        PFID(lod_object_fid(lo)),
-                        lo->ldo_mirrors[i].lme_id,
-                        lo->ldo_mirrors[primary].lme_id);
+               if (lo->ldo_mirrors[i].lme_prefer == 0)
+                       continue;
 
                primary = i;
+               break;
        }
        if (primary < 0) {
-               CERROR(DFID ": doesn't have a primary mirror\n",
-                      PFID(lod_object_fid(lo)));
-               GOTO(out, rc = -ENODATA);
+               /* no primary, use any in-sync */
+               for (i = 0; i < lo->ldo_mirror_count; i++) {
+                       if (lo->ldo_mirrors[i].lme_stale)
+                               continue;
+                       primary = i;
+                       break;
+               }
+               if (primary < 0) {
+                       CERROR(DFID ": doesn't have a primary mirror\n",
+                              PFID(lod_object_fid(lo)));
+                       GOTO(out, rc = -ENODATA);
+               }
        }
 
        CDEBUG(D_LAYOUT, DFID": found primary %u\n",
@@ -6628,6 +7815,9 @@ static int lod_declare_update_write_pending(const struct lu_env *env,
         * 2. transfer layout version to all objects to close write era. */
 
        if (mlc->mlc_opc == MD_LAYOUT_WRITE) {
+               struct layout_intent *layout = mlc->mlc_intent;
+               int write = layout->li_opc == LAYOUT_INTENT_WRITE;
+
                LASSERT(mlc->mlc_intent != NULL);
 
                extent = mlc->mlc_intent->li_extent;
@@ -6635,6 +7825,12 @@ static int lod_declare_update_write_pending(const struct lu_env *env,
                CDEBUG(D_LAYOUT, DFID": intent to write: "DEXT"\n",
                       PFID(lod_object_fid(lo)), PEXT(&extent));
 
+               /* 1. Update extents of primary before staling */
+               rc = lod_declare_update_extents(env, lo, &extent, th, primary,
+                                               write);
+               if (rc < 0)
+                       GOTO(out, rc);
+
                if (mlc->mlc_intent->li_opc == LAYOUT_INTENT_TRUNC) {
                        /**
                         * trunc transfers [0, size) in the intent extent, we'd
@@ -6643,10 +7839,13 @@ static int lod_declare_update_write_pending(const struct lu_env *env,
                        extent.e_start = extent.e_end;
                        extent.e_end = OBD_OBJECT_EOF;
                }
-               /* 1. stale overlapping components */
-               lod_stale_components(lo, primary, &extent);
 
-               /* 2. find out the components need instantiating.
+               /* 2. stale overlapping components */
+               rc = lod_stale_components(env, lo, primary, &extent, th);
+               if (rc < 0)
+                       GOTO(out, rc);
+
+               /* 3. find the components which need instantiating.
                 * instantiate [0, mlc->mlc_intent->e_end) */
 
                /* restore truncate intent extent */
@@ -6659,7 +7858,7 @@ static int lod_declare_update_write_pending(const struct lu_env *env,
                                                     &lod_comp->llc_extent))
                                break;
 
-                       if (lod_comp_inited(lod_comp))
+                       if (!lod_is_instantiation_needed(lod_comp))
                                continue;
 
                        CDEBUG(D_LAYOUT, "write instantiate %d / %d\n",
@@ -6692,7 +7891,7 @@ static int lod_declare_update_write_pending(const struct lu_env *env,
                lo->ldo_flr_state = LCM_FL_SYNC_PENDING;
        }
 
-       rc = lod_declare_instantiate_components(env, lo, th);
+       rc = lod_declare_instantiate_components(env, lo, th, 0);
        if (rc)
                GOTO(out, rc);
 
@@ -6721,6 +7920,7 @@ static int lod_declare_update_sync_pending(const struct lu_env *env,
                struct thandle *th)
 {
        struct lod_thread_info  *info = lod_env_info(env);
+       struct lu_attr *layout_attr = &info->lti_layout_attr;
        unsigned sync_components = 0;
        unsigned resync_components = 0;
        int i;
@@ -6786,13 +7986,19 @@ static int lod_declare_update_sync_pending(const struct lu_env *env,
                GOTO(out, rc = -EINVAL);
        }
 
-       CDEBUG(D_LAYOUT, DFID": resynced %u/%zu components\n",
+       CDEBUG(D_LAYOUT, DFID": synced %u resynced %u/%zu components\n",
               PFID(lod_object_fid(lo)),
-              resync_components, mlc->mlc_resync_count);
+              sync_components, resync_components, mlc->mlc_resync_count);
 
        lo->ldo_flr_state = LCM_FL_RDONLY;
        lod_obj_inc_layout_gen(lo);
 
+       layout_attr->la_valid = LA_LAYOUT_VERSION;
+       layout_attr->la_layout_version = 0; /* set current version */
+       rc = lod_declare_attr_set(env, &lo->ldo_obj, layout_attr, th);
+       if (rc)
+               GOTO(out, rc);
+
        info->lti_buf.lb_len = lod_comp_md_size(lo, false);
        rc = lod_sub_declare_xattr_set(env, lod_object_child(lo),
                                       &info->lti_buf, XATTR_NAME_LOV, 0, th);
@@ -6804,22 +8010,632 @@ out:
        RETURN(rc);
 }
 
-static int lod_declare_layout_change(const struct lu_env *env,
-               struct dt_object *dt, struct md_layout_change *mlc,
-               struct thandle *th)
+typedef int (*mlc_handler)(const struct lu_env *env, struct dt_object *dt,
+                          const struct md_layout_change *mlc,
+                          struct thandle *th);
+
+/**
+ * Attach stripes after target's for migrating directory. NB, we
+ * only need to declare this, the actual work is done inside
+ * lod_xattr_set_lmv().
+ *
+ * \param[in] env      execution environment
+ * \param[in] dt       target object
+ * \param[in] mlc      layout change data
+ * \param[in] th       transaction handle
+ *
+ * \retval             0 on success
+ * \retval             negative if failed
+ */
+static int lod_dir_declare_layout_attach(const struct lu_env *env,
+                                        struct dt_object *dt,
+                                        const struct md_layout_change *mlc,
+                                        struct thandle *th)
 {
-       struct lod_thread_info  *info = lod_env_info(env);
+       struct lod_thread_info *info = lod_env_info(env);
+       struct lod_device *lod = lu2lod_dev(dt->do_lu.lo_dev);
+       struct lod_tgt_descs *ltd = &lod->lod_mdt_descs;
        struct lod_object *lo = lod_dt_obj(dt);
-       int rc;
-       ENTRY;
-
-       if (!S_ISREG(dt->do_lu.lo_header->loh_attr) || !dt_object_exists(dt) ||
-           dt_object_remote(dt_object_child(dt)))
-               RETURN(-EINVAL);
-
-       rc = lod_striping_load(env, lo);
-       if (rc)
-               GOTO(out, rc);
+       struct dt_object *next = dt_object_child(dt);
+       struct dt_object_format *dof = &info->lti_format;
+       struct lmv_mds_md_v1 *lmv = mlc->mlc_buf.lb_buf;
+       struct dt_object **stripes;
+       __u32 stripe_count = le32_to_cpu(lmv->lmv_stripe_count);
+       struct lu_fid *fid = &info->lti_fid;
+       struct lod_tgt_desc *tgt;
+       struct dt_object *dto;
+       struct dt_device *tgt_dt;
+       int type = LU_SEQ_RANGE_ANY;
+       struct dt_insert_rec *rec = &info->lti_dt_rec;
+       char *stripe_name = info->lti_key;
+       struct lu_name *sname;
+       struct linkea_data ldata = { NULL };
+       struct lu_buf linkea_buf;
+       __u32 idx;
+       int i;
+       int rc;
+
+       ENTRY;
+
+       if (!lmv_is_sane(lmv))
+               RETURN(-EINVAL);
+
+       if (!dt_try_as_dir(env, dt))
+               return -ENOTDIR;
+
+       dof->dof_type = DFT_DIR;
+
+       OBD_ALLOC_PTR_ARRAY(stripes, (lo->ldo_dir_stripe_count + stripe_count));
+       if (!stripes)
+               RETURN(-ENOMEM);
+
+       for (i = 0; i < lo->ldo_dir_stripe_count; i++)
+               stripes[i] = lo->ldo_stripe[i];
+
+       rec->rec_type = S_IFDIR;
+
+       for (i = 0; i < stripe_count; i++) {
+               fid_le_to_cpu(fid,
+                       &lmv->lmv_stripe_fids[i]);
+               if (!fid_is_sane(fid))
+                       continue;
+
+               rc = lod_fld_lookup(env, lod, fid, &idx, &type);
+               if (rc)
+                       GOTO(out, rc);
+
+               if (idx == lod2lu_dev(lod)->ld_site->ld_seq_site->ss_node_id) {
+                       tgt_dt = lod->lod_child;
+               } else {
+                       tgt = LTD_TGT(ltd, idx);
+                       if (tgt == NULL)
+                               GOTO(out, rc = -ESTALE);
+                       tgt_dt = tgt->ltd_tgt;
+               }
+
+               dto = dt_locate_at(env, tgt_dt, fid,
+                                 lo->ldo_obj.do_lu.lo_dev->ld_site->ls_top_dev,
+                                 NULL);
+               if (IS_ERR(dto))
+                       GOTO(out, rc = PTR_ERR(dto));
+
+               stripes[i + lo->ldo_dir_stripe_count] = dto;
+
+               if (!dt_try_as_dir(env, dto))
+                       GOTO(out, rc = -ENOTDIR);
+
+               rc = lod_sub_declare_ref_add(env, dto, th);
+               if (rc)
+                       GOTO(out, rc);
+
+               rec->rec_fid = lu_object_fid(&dto->do_lu);
+               rc = lod_sub_declare_insert(env, dto,
+                                           (const struct dt_rec *)rec,
+                                           (const struct dt_key *)dot, th);
+               if (rc)
+                       GOTO(out, rc);
+
+               rc = lod_sub_declare_insert(env, dto,
+                                           (const struct dt_rec *)rec,
+                                           (const struct dt_key *)dotdot, th);
+               if (rc)
+                       GOTO(out, rc);
+
+               rc = lod_sub_declare_xattr_set(env, dto, &mlc->mlc_buf,
+                                               XATTR_NAME_LMV, 0, th);
+               if (rc)
+                       GOTO(out, rc);
+
+               snprintf(stripe_name, sizeof(info->lti_key), DFID":%u",
+                        PFID(lu_object_fid(&dto->do_lu)),
+                        i + lo->ldo_dir_stripe_count);
+
+               sname = lod_name_get(env, stripe_name, strlen(stripe_name));
+               rc = linkea_links_new(&ldata, &info->lti_linkea_buf,
+                                     sname, lu_object_fid(&dt->do_lu));
+               if (rc)
+                       GOTO(out, rc);
+
+               linkea_buf.lb_buf = ldata.ld_buf->lb_buf;
+               linkea_buf.lb_len = ldata.ld_leh->leh_len;
+               rc = lod_sub_declare_xattr_set(env, dto, &linkea_buf,
+                                              XATTR_NAME_LINK, 0, th);
+               if (rc)
+                       GOTO(out, rc);
+
+               rc = lod_sub_declare_insert(env, next,
+                                           (const struct dt_rec *)rec,
+                                           (const struct dt_key *)stripe_name,
+                                           th);
+               if (rc)
+                       GOTO(out, rc);
+
+               rc = lod_sub_declare_ref_add(env, next, th);
+               if (rc)
+                       GOTO(out, rc);
+       }
+
+       if (lo->ldo_stripe)
+               OBD_FREE_PTR_ARRAY(lo->ldo_stripe,
+                                  lo->ldo_dir_stripes_allocated);
+       lo->ldo_stripe = stripes;
+       lo->ldo_dir_migrate_offset = lo->ldo_dir_stripe_count;
+       lo->ldo_dir_migrate_hash = le32_to_cpu(lmv->lmv_hash_type);
+       lo->ldo_dir_stripe_count += stripe_count;
+       lo->ldo_dir_stripes_allocated += stripe_count;
+
+       /* plain directory split creates target as a plain directory, while
+        * after source attached as the first stripe, it becomes a striped
+        * directory, set correct do_index_ops, otherwise it can't be unlinked.
+        */
+       dt->do_index_ops = &lod_striped_index_ops;
+
+       RETURN(0);
+out:
+       i = lo->ldo_dir_stripe_count;
+       while (i < lo->ldo_dir_stripe_count + stripe_count && stripes[i])
+               dt_object_put(env, stripes[i++]);
+
+       OBD_FREE_PTR_ARRAY(stripes, stripe_count + lo->ldo_dir_stripe_count);
+       return rc;
+}
+
+static int lod_dir_declare_layout_detach(const struct lu_env *env,
+                                        struct dt_object *dt,
+                                        const struct md_layout_change *unused,
+                                        struct thandle *th)
+{
+       struct lod_thread_info *info = lod_env_info(env);
+       struct lod_object *lo = lod_dt_obj(dt);
+       struct dt_object *next = dt_object_child(dt);
+       char *stripe_name = info->lti_key;
+       struct dt_object *dto;
+       int i;
+       int rc = 0;
+
+       if (!dt_try_as_dir(env, dt))
+               return -ENOTDIR;
+
+       if (!lo->ldo_dir_stripe_count)
+               return lod_sub_declare_delete(env, next,
+                                       (const struct dt_key *)dotdot, th);
+
+       for (i = 0; i < lo->ldo_dir_stripe_count; i++) {
+               dto = lo->ldo_stripe[i];
+               if (!dto)
+                       continue;
+
+               if (!dt_try_as_dir(env, dto))
+                       return -ENOTDIR;
+
+               rc = lod_sub_declare_delete(env, dto,
+                                       (const struct dt_key *)dotdot, th);
+               if (rc)
+                       return rc;
+
+               snprintf(stripe_name, sizeof(info->lti_key), DFID":%d",
+                        PFID(lu_object_fid(&dto->do_lu)), i);
+
+               rc = lod_sub_declare_delete(env, next,
+                                       (const struct dt_key *)stripe_name, th);
+               if (rc)
+                       return rc;
+
+               rc = lod_sub_declare_ref_del(env, next, th);
+               if (rc)
+                       return rc;
+       }
+
+       return 0;
+}
+
+static int dt_dir_is_empty(const struct lu_env *env,
+                          struct dt_object *obj)
+{
+       struct dt_it *it;
+       const struct dt_it_ops *iops;
+       int rc;
+
+       ENTRY;
+
+       if (!dt_try_as_dir(env, obj))
+               RETURN(-ENOTDIR);
+
+       iops = &obj->do_index_ops->dio_it;
+       it = iops->init(env, obj, LUDA_64BITHASH);
+       if (IS_ERR(it))
+               RETURN(PTR_ERR(it));
+
+       rc = iops->get(env, it, (const struct dt_key *)"");
+       if (rc > 0) {
+               int i;
+
+               for (rc = 0, i = 0; rc == 0 && i < 3; ++i)
+                       rc = iops->next(env, it);
+               if (!rc)
+                       rc = -ENOTEMPTY;
+               else if (rc == 1)
+                       rc = 0;
+       } else if (!rc) {
+               /* Huh? Index contains no zero key? */
+               rc = -EIO;
+       }
+
+       iops->put(env, it);
+       iops->fini(env, it);
+
+       RETURN(rc);
+}
+
+static int lod_dir_declare_layout_shrink(const struct lu_env *env,
+                                        struct dt_object *dt,
+                                        const struct md_layout_change *mlc,
+                                        struct thandle *th)
+{
+       struct lod_thread_info *info = lod_env_info(env);
+       struct lod_object *lo = lod_dt_obj(dt);
+       struct dt_object *next = dt_object_child(dt);
+       struct lmv_user_md *lmu = mlc->mlc_buf.lb_buf;
+       char *stripe_name = info->lti_key;
+       struct lu_buf *lmv_buf = &info->lti_buf;
+       __u32 final_stripe_count;
+       struct dt_object *dto;
+       int i;
+       int rc;
+
+       LASSERT(lmu);
+
+       if (!dt_try_as_dir(env, dt))
+               return -ENOTDIR;
+
+       /* shouldn't be called on plain directory */
+       LASSERT(lo->ldo_dir_stripe_count);
+
+       lmv_buf->lb_buf = &info->lti_lmv.lmv_md_v1;
+       lmv_buf->lb_len = sizeof(info->lti_lmv.lmv_md_v1);
+
+       final_stripe_count = le32_to_cpu(lmu->lum_stripe_count);
+       LASSERT(final_stripe_count &&
+               final_stripe_count < lo->ldo_dir_stripe_count);
+
+       for (i = 0; i < lo->ldo_dir_stripe_count; i++) {
+               dto = lo->ldo_stripe[i];
+               if (!dto)
+                       continue;
+
+               if (i < final_stripe_count) {
+                       rc = lod_sub_declare_xattr_set(env, dto, lmv_buf,
+                                                      XATTR_NAME_LMV,
+                                                      LU_XATTR_REPLACE, th);
+                       if (rc)
+                               return rc;
+
+                       continue;
+               }
+
+               rc = dt_dir_is_empty(env, dto);
+               if (rc < 0)
+                       return rc;
+
+               rc = lod_sub_declare_ref_del(env, dto, th);
+               if (rc)
+                       return rc;
+
+               rc = lod_sub_declare_destroy(env, dto, th);
+               if (rc)
+                       return rc;
+
+               snprintf(stripe_name, sizeof(info->lti_key), DFID":%d",
+                        PFID(lu_object_fid(&dto->do_lu)), i);
+
+               rc = lod_sub_declare_delete(env, next,
+                                       (const struct dt_key *)stripe_name, th);
+               if (rc)
+                       return rc;
+
+               rc = lod_sub_declare_ref_del(env, next, th);
+               if (rc)
+                       return rc;
+       }
+
+       rc = lod_sub_declare_xattr_set(env, next, lmv_buf, XATTR_NAME_LMV,
+                                      LU_XATTR_REPLACE, th);
+       return rc;
+}
+
+/**
+ * Allocate stripes for split directory.
+ *
+ * \param[in] env      execution environment
+ * \param[in] dt       target object
+ * \param[in] mlc      layout change data
+ * \param[in] th       transaction handle
+ *
+ * \retval             0 on success
+ * \retval             negative if failed
+ */
+static int lod_dir_declare_layout_split(const struct lu_env *env,
+                                       struct dt_object *dt,
+                                       const struct md_layout_change *mlc,
+                                       struct thandle *th)
+{
+       struct lod_thread_info *info = lod_env_info(env);
+       struct lod_device *lod = lu2lod_dev(dt->do_lu.lo_dev);
+       struct lod_object *lo = lod_dt_obj(dt);
+       struct dt_object_format *dof = &info->lti_format;
+       struct lmv_user_md_v1 *lum = mlc->mlc_spec->u.sp_ea.eadata;
+       struct dt_object **stripes;
+       u32 stripe_count;
+       u32 saved_count;
+       int i;
+       int rc;
+
+       ENTRY;
+
+       LASSERT(le32_to_cpu(lum->lum_magic) == LMV_USER_MAGIC);
+       LASSERT(le32_to_cpu(lum->lum_stripe_offset) == LMV_OFFSET_DEFAULT);
+
+       saved_count = lo->ldo_dir_stripes_allocated;
+       stripe_count = le32_to_cpu(lum->lum_stripe_count);
+       if (stripe_count <= saved_count)
+               RETURN(-EINVAL);
+
+       dof->dof_type = DFT_DIR;
+
+       OBD_ALLOC(stripes, sizeof(*stripes) * stripe_count);
+       if (!stripes)
+               RETURN(-ENOMEM);
+
+       for (i = 0; i < lo->ldo_dir_stripes_allocated; i++)
+               stripes[i] = lo->ldo_stripe[i];
+
+       lod_qos_statfs_update(env, lod, &lod->lod_mdt_descs);
+       rc = lod_mdt_alloc_qos(env, lo, stripes, saved_count, stripe_count);
+       if (rc == -EAGAIN)
+               rc = lod_mdt_alloc_rr(env, lo, stripes, saved_count,
+                                     stripe_count);
+       if (rc < 0) {
+               OBD_FREE(stripes, sizeof(*stripes) * stripe_count);
+               RETURN(rc);
+       }
+
+       LASSERT(rc > saved_count);
+       OBD_FREE(lo->ldo_stripe,
+                sizeof(*stripes) * lo->ldo_dir_stripes_allocated);
+       lo->ldo_stripe = stripes;
+       lo->ldo_dir_striped = 1;
+       lo->ldo_dir_stripe_count = rc;
+       lo->ldo_dir_stripes_allocated = stripe_count;
+       lo->ldo_dir_split_hash = lo->ldo_dir_hash_type;
+       lo->ldo_dir_hash_type = le32_to_cpu(lum->lum_hash_type);
+       if (!lmv_is_known_hash_type(lo->ldo_dir_hash_type))
+               lo->ldo_dir_hash_type =
+                       lod->lod_mdt_descs.ltd_lmv_desc.ld_pattern;
+       lo->ldo_dir_hash_type |= LMV_HASH_FLAG_SPLIT | LMV_HASH_FLAG_MIGRATION;
+       lo->ldo_dir_split_offset = saved_count;
+       lo->ldo_dir_layout_version++;
+       lo->ldo_dir_stripe_loaded = 1;
+
+       rc = lod_dir_declare_create_stripes(env, dt, mlc->mlc_attr, dof, th);
+       if (rc)
+               lod_striping_free(env, lo);
+
+       RETURN(rc);
+}
+
+/*
+ * detach all stripes from dir master object, NB, stripes are not destroyed, but
+ * deleted from it's parent namespace, this function is called in two places:
+ * 1. mdd_migrate_mdt() detach stripes from source, and attach them to
+ *    target.
+ * 2. mdd_dir_layout_update() detach stripe before turning 1-stripe directory to
+ *    a plain directory.
+ *
+ * \param[in] env      execution environment
+ * \param[in] dt       target object
+ * \param[in] mlc      layout change data
+ * \param[in] th       transaction handle
+ *
+ * \retval             0 on success
+ * \retval             negative if failed
+ */
+static int lod_dir_layout_detach(const struct lu_env *env,
+                                struct dt_object *dt,
+                                const struct md_layout_change *mlc,
+                                struct thandle *th)
+{
+       struct lod_thread_info *info = lod_env_info(env);
+       struct lod_object *lo = lod_dt_obj(dt);
+       struct dt_object *next = dt_object_child(dt);
+       char *stripe_name = info->lti_key;
+       struct dt_object *dto;
+       int i;
+       int rc = 0;
+
+       ENTRY;
+
+       if (!lo->ldo_dir_stripe_count) {
+               /* plain directory delete .. */
+               rc = lod_sub_delete(env, next,
+                                   (const struct dt_key *)dotdot, th);
+               RETURN(rc);
+       }
+
+       for (i = 0; i < lo->ldo_dir_stripe_count; i++) {
+               dto = lo->ldo_stripe[i];
+               if (!dto)
+                       continue;
+
+               rc = lod_sub_delete(env, dto,
+                                   (const struct dt_key *)dotdot, th);
+               if (rc)
+                       break;
+
+               snprintf(stripe_name, sizeof(info->lti_key), DFID":%d",
+                        PFID(lu_object_fid(&dto->do_lu)), i);
+
+               rc = lod_sub_delete(env, next,
+                                   (const struct dt_key *)stripe_name, th);
+               if (rc)
+                       break;
+
+               rc = lod_sub_ref_del(env, next, th);
+               if (rc)
+                       break;
+       }
+
+       for (i = 0; i < lo->ldo_dir_stripe_count; i++) {
+               dto = lo->ldo_stripe[i];
+               if (dto)
+                       dt_object_put(env, dto);
+       }
+       OBD_FREE_PTR_ARRAY(lo->ldo_stripe, lo->ldo_dir_stripes_allocated);
+       lo->ldo_stripe = NULL;
+       lo->ldo_dir_stripes_allocated = 0;
+       lo->ldo_dir_stripe_count = 0;
+       dt->do_index_ops = &lod_index_ops;
+
+       RETURN(rc);
+}
+
+static int lod_dir_layout_shrink(const struct lu_env *env,
+                                struct dt_object *dt,
+                                const struct md_layout_change *mlc,
+                                struct thandle *th)
+{
+       struct lod_thread_info *info = lod_env_info(env);
+       struct lod_object *lo = lod_dt_obj(dt);
+       struct lod_device *lod = lu2lod_dev(lo->ldo_obj.do_lu.lo_dev);
+       struct dt_object *next = dt_object_child(dt);
+       struct lmv_user_md *lmu = mlc->mlc_buf.lb_buf;
+       __u32 final_stripe_count;
+       char *stripe_name = info->lti_key;
+       struct dt_object *dto;
+       struct lu_buf *lmv_buf = &info->lti_buf;
+       struct lmv_mds_md_v1 *lmv = &info->lti_lmv.lmv_md_v1;
+       u32 mdtidx;
+       int type = LU_SEQ_RANGE_ANY;
+       int i;
+       int rc;
+
+       ENTRY;
+
+       final_stripe_count = le32_to_cpu(lmu->lum_stripe_count);
+
+       lmv_buf->lb_buf = lmv;
+       lmv_buf->lb_len = sizeof(*lmv);
+       lmv->lmv_magic = cpu_to_le32(LMV_MAGIC_STRIPE);
+       lmv->lmv_stripe_count = cpu_to_le32(final_stripe_count);
+       lmv->lmv_hash_type = cpu_to_le32(lo->ldo_dir_hash_type) &
+                            cpu_to_le32(LMV_HASH_TYPE_MASK |
+                                        LMV_HASH_FLAG_FIXED);
+       lmv->lmv_layout_version =
+                       cpu_to_le32(lo->ldo_dir_layout_version + 1);
+       lmv->lmv_migrate_offset = 0;
+       lmv->lmv_migrate_hash = 0;
+
+       for (i = 0; i < lo->ldo_dir_stripe_count; i++) {
+               dto = lo->ldo_stripe[i];
+               if (!dto)
+                       continue;
+
+               if (i < final_stripe_count) {
+                       rc = lod_fld_lookup(env, lod,
+                                           lu_object_fid(&dto->do_lu),
+                                           &mdtidx, &type);
+                       if (rc)
+                               RETURN(rc);
+
+                       lmv->lmv_master_mdt_index = cpu_to_le32(mdtidx);
+                       rc = lod_sub_xattr_set(env, dto, lmv_buf,
+                                              XATTR_NAME_LMV,
+                                              LU_XATTR_REPLACE, th);
+                       if (rc)
+                               RETURN(rc);
+
+                       continue;
+               }
+
+               dt_write_lock(env, dto, DT_TGT_CHILD);
+               rc = lod_sub_ref_del(env, dto, th);
+               dt_write_unlock(env, dto);
+               if (rc)
+                       RETURN(rc);
+
+               rc = lod_sub_destroy(env, dto, th);
+               if (rc)
+                       RETURN(rc);
+
+               snprintf(stripe_name, sizeof(info->lti_key), DFID":%d",
+                        PFID(lu_object_fid(&dto->do_lu)), i);
+
+               rc = lod_sub_delete(env, next,
+                                   (const struct dt_key *)stripe_name, th);
+               if (rc)
+                       RETURN(rc);
+
+               rc = lod_sub_ref_del(env, next, th);
+               if (rc)
+                       RETURN(rc);
+       }
+
+       rc = lod_fld_lookup(env, lod, lu_object_fid(&dt->do_lu), &mdtidx,
+                           &type);
+       if (rc)
+               RETURN(rc);
+
+       lmv->lmv_magic = cpu_to_le32(LMV_MAGIC_V1);
+       lmv->lmv_master_mdt_index = cpu_to_le32(mdtidx);
+       rc = lod_sub_xattr_set(env, next, lmv_buf, XATTR_NAME_LMV,
+                              LU_XATTR_REPLACE, th);
+       if (rc)
+               RETURN(rc);
+
+       for (i = final_stripe_count; i < lo->ldo_dir_stripe_count; i++) {
+               dto = lo->ldo_stripe[i];
+               if (dto)
+                       dt_object_put(env, dto);
+       }
+       lo->ldo_dir_stripe_count = final_stripe_count;
+
+       RETURN(rc);
+}
+
+static mlc_handler dir_mlc_declare_ops[MD_LAYOUT_MAX] = {
+       [MD_LAYOUT_ATTACH] = lod_dir_declare_layout_attach,
+       [MD_LAYOUT_DETACH] = lod_dir_declare_layout_detach,
+       [MD_LAYOUT_SHRINK] = lod_dir_declare_layout_shrink,
+       [MD_LAYOUT_SPLIT]  = lod_dir_declare_layout_split,
+};
+
+static mlc_handler dir_mlc_ops[MD_LAYOUT_MAX] = {
+       [MD_LAYOUT_DETACH] = lod_dir_layout_detach,
+       [MD_LAYOUT_SHRINK] = lod_dir_layout_shrink,
+};
+
+static int lod_declare_layout_change(const struct lu_env *env,
+               struct dt_object *dt, struct md_layout_change *mlc,
+               struct thandle *th)
+{
+       struct lod_thread_info  *info = lod_env_info(env);
+       struct lod_object *lo = lod_dt_obj(dt);
+       int rc;
+
+       ENTRY;
+
+       if (S_ISDIR(dt->do_lu.lo_header->loh_attr)) {
+               LASSERT(dir_mlc_declare_ops[mlc->mlc_opc]);
+               rc = dir_mlc_declare_ops[mlc->mlc_opc](env, dt, mlc, th);
+               RETURN(rc);
+       }
+
+       if (!S_ISREG(dt->do_lu.lo_header->loh_attr) || !dt_object_exists(dt) ||
+           dt_object_remote(dt_object_child(dt)))
+               RETURN(-EINVAL);
+
+       rc = lod_striping_load(env, lo);
+       if (rc)
+               GOTO(out, rc);
 
        LASSERT(lo->ldo_comp_cnt > 0);
 
@@ -6860,16 +8676,24 @@ static int lod_layout_change(const struct lu_env *env, struct dt_object *dt,
        struct lod_object *lo = lod_dt_obj(dt);
        int rc;
 
+       ENTRY;
+
+       if (S_ISDIR(dt->do_lu.lo_header->loh_attr)) {
+               LASSERT(dir_mlc_ops[mlc->mlc_opc]);
+               rc = dir_mlc_ops[mlc->mlc_opc](env, dt, mlc, th);
+               RETURN(rc);
+       }
+
        rc = lod_striped_create(env, dt, attr, NULL, th);
        if (!rc && layout_attr->la_valid & LA_LAYOUT_VERSION) {
                layout_attr->la_layout_version |= lo->ldo_layout_gen;
                rc = lod_attr_set(env, dt, layout_attr, th);
        }
 
-       return rc;
+       RETURN(rc);
 }
 
-struct dt_object_operations lod_obj_ops = {
+const struct dt_object_operations lod_obj_ops = {
        .do_read_lock           = lod_read_lock,
        .do_write_lock          = lod_write_lock,
        .do_read_unlock         = lod_read_unlock,
@@ -6970,7 +8794,7 @@ static int lod_punch(const struct lu_env *env, struct dt_object *dt,
  * body_ops themselves will check file type inside, see lod_read/write/punch for
  * details.
  */
-const struct dt_body_operations lod_body_ops = {
+static const struct dt_body_operations lod_body_ops = {
        .dbo_read               = lod_read,
        .dbo_declare_write      = lod_declare_write,
        .dbo_write              = lod_write,
@@ -7003,16 +8827,8 @@ static int lod_object_init(const struct lu_env *env, struct lu_object *lo,
        ENTRY;
 
        rc = lod_fld_lookup(env, lod, lu_object_fid(lo), &idx, &type);
-       if (rc != 0) {
-               /* Note: Sometimes, it will Return EAGAIN here, see
-                * ptrlpc_import_delay_req(), which might confuse
-                * lu_object_find_at() and make it wait there incorrectly.
-                * so we convert it to EIO here.*/
-               if (rc == -EAGAIN)
-                       rc = -EIO;
-
+       if (rc != 0)
                RETURN(rc);
-       }
 
        if (type == LU_SEQ_RANGE_MDT &&
            idx == lu_site2seq(lo->lo_dev->ld_site)->ss_node_id) {
@@ -7029,7 +8845,7 @@ static int lod_object_init(const struct lu_env *env, struct lu_object *lo,
 
        if (ltd != NULL) {
                if (ltd->ltd_tgts_size > idx &&
-                   cfs_bitmap_check(ltd->ltd_tgt_bitmap, idx)) {
+                   test_bit(idx, ltd->ltd_tgt_bitmap)) {
                        tgt = LTD_TGT(ltd, idx);
 
                        LASSERT(tgt != NULL);
@@ -7153,13 +8969,11 @@ void lod_striping_free_nolock(const struct lu_env *env, struct lod_object *lo)
                                        lu_object_put(env,
                                               &lod_comp->llc_stripe[j]->do_lu);
                        }
-                       OBD_FREE(lod_comp->llc_stripe,
-                                sizeof(struct dt_object *) *
-                                lod_comp->llc_stripes_allocated);
+                       OBD_FREE_PTR_ARRAY(lod_comp->llc_stripe,
+                                          lod_comp->llc_stripes_allocated);
                        lod_comp->llc_stripe = NULL;
-                       OBD_FREE(lod_comp->llc_ost_indices,
-                                sizeof(__u32) *
-                                lod_comp->llc_stripes_allocated);
+                       OBD_FREE_PTR_ARRAY(lod_comp->llc_ost_indices,
+                                          lod_comp->llc_stripes_allocated);
                        lod_comp->llc_ost_indices = NULL;
                        lod_comp->llc_stripes_allocated = 0;
                }
@@ -7188,6 +9002,7 @@ static void lod_object_free(const struct lu_env *env, struct lu_object *o)
        /* release all underlying object pinned */
        lod_striping_free(env, lo);
        lu_object_fini(o);
+       /* lo doesn't contain a lu_object_header, so we don't need call_rcu */
        OBD_SLAB_FREE_PTR(lo, lod_object_kmem);
 }
 
@@ -7217,7 +9032,7 @@ static int lod_object_print(const struct lu_env *env, void *cookie,
        return (*p)(env, cookie, LUSTRE_LOD_NAME"-object@%p", o);
 }
 
-struct lu_object_operations lod_lu_obj_ops = {
+const struct lu_object_operations lod_lu_obj_ops = {
        .loo_object_init        = lod_object_init,
        .loo_object_free        = lod_object_free,
        .loo_object_release     = lod_object_release,