LU-17703 lod: check the inherited pool for conflicts

[fs/lustre-release.git] / lustre / lod / lod_lov.c

diff --git a/lustre/lod/lod_lov.c b/lustre/lod/lod_lov.c
index 626938e..fd0163b 100644 (file)
--- a/lustre/lod/lod_lov.c
+++ b/lustre/lod/lod_lov.c
@@ -753,6 +753,9 @@ static int lod_gen_component_ea(const struct lu_env *env,
                lod_comp = &lo->ldo_comp_entries[comp_idx];
 
        magic = lod_comp->llc_pool != NULL ? LOV_MAGIC_V3 : LOV_MAGIC_V1;
+       if (is_dir && lod_comp->llc_ostlist.op_count)
+               magic = LOV_MAGIC_SPECIFIC;
+
        if (lod_comp->llc_pattern == 0) /* default striping */
                lod_comp->llc_pattern = LOV_PATTERN_RAID0;
 
@@ -779,7 +782,7 @@ static int lod_gen_component_ea(const struct lu_env *env,
        } else {
                struct lov_mds_md_v3 *v3 = (struct lov_mds_md_v3 *)lmm;
                size_t cplen = strscpy(v3->lmm_pool_name,
-                                      lod_comp->llc_pool,
+                                      lod_comp->llc_pool ? : "\0",
                                       sizeof(v3->lmm_pool_name));
                if (cplen < 0)
                        RETURN(cplen);
@@ -801,7 +804,8 @@ static int lod_gen_component_ea(const struct lu_env *env,
        if (!is_dir && lo->ldo_is_composite)
                lod_comp_shrink_stripe_count(lod_comp, &stripe_count);
 
-       if (is_dir || lod_comp->llc_pattern & LOV_PATTERN_F_RELEASED)
+       if ((is_dir && magic != LOV_MAGIC_SPECIFIC) ||
+           lod_comp->llc_pattern & LOV_PATTERN_F_RELEASED)
                GOTO(done, rc = 0);
 
        /* generate ost_idx of this component stripe */