LU-14448 lod: verify LOV before set/inherit

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

diff --git a/lustre/lod/lod_lov.c b/lustre/lod/lod_lov.c
index ab139b7..3dd8696 100644 (file)
--- a/lustre/lod/lod_lov.c
+++ b/lustre/lod/lod_lov.c
@@ -1653,7 +1653,9 @@ static inline
 struct lov_comp_md_entry_v1 *comp_entry_v1(struct lov_comp_md_v1 *comp, int i)
 {
        LASSERTF((le32_to_cpu(comp->lcm_magic) & ~LOV_MAGIC_DEFINED) ==
 struct lov_comp_md_entry_v1 *comp_entry_v1(struct lov_comp_md_v1 *comp, int i)
 {
        LASSERTF((le32_to_cpu(comp->lcm_magic) & ~LOV_MAGIC_DEFINED) ==

-                LOV_USER_MAGIC_COMP_V1, "Wrong magic %x\n",
+                LOV_USER_MAGIC_COMP_V1 ||
+                (le32_to_cpu(comp->lcm_magic) & ~LOV_MAGIC_DEFINED) ==
+                LOV_USER_MAGIC_SEL, "Wrong magic %x\n",

                 le32_to_cpu(comp->lcm_magic));
        LASSERTF(i >= 0 && i < le16_to_cpu(comp->lcm_entry_count),
                 "bad index %d, max = %d\n",
                 le32_to_cpu(comp->lcm_magic));
        LASSERTF(i >= 0 && i < le16_to_cpu(comp->lcm_entry_count),
                 "bad index %d, max = %d\n",


@@ -1935,18 +1937,22 @@ int lod_verify_striping(const struct lu_env *env, struct lod_device *d,
                RETURN(-EINVAL);
        }
 
                RETURN(-EINVAL);
        }
 

-       if (magic != LOV_USER_MAGIC_V1 &&
-           magic != LOV_USER_MAGIC_V3 &&
-           magic != LOV_USER_MAGIC_SPECIFIC &&
-           magic != LOV_USER_MAGIC_COMP_V1) {
+       switch (magic) {
+       case LOV_USER_MAGIC_FOREIGN:
+               RETURN(0);
+       case LOV_USER_MAGIC_V1:
+       case LOV_USER_MAGIC_V3:
+       case LOV_USER_MAGIC_SPECIFIC:
+               RETURN(lod_verify_v1v3(d, buf, is_from_disk));
+       case LOV_USER_MAGIC_COMP_V1:
+       case LOV_USER_MAGIC_SEL:
+               break;
+       default:

                CDEBUG(D_LAYOUT, "bad userland LOV MAGIC: %#x\n",
                       le32_to_cpu(lum->lmm_magic));
                RETURN(-EINVAL);
        }
 
                CDEBUG(D_LAYOUT, "bad userland LOV MAGIC: %#x\n",
                       le32_to_cpu(lum->lmm_magic));
                RETURN(-EINVAL);
        }
 

-       if (magic != LOV_USER_MAGIC_COMP_V1)
-               RETURN(lod_verify_v1v3(d, buf, is_from_disk));
-

        /* magic == LOV_USER_MAGIC_COMP_V1 */
        comp_v1 = buf->lb_buf;
        if (buf->lb_len < le32_to_cpu(comp_v1->lcm_size)) {
        /* magic == LOV_USER_MAGIC_COMP_V1 */
        comp_v1 = buf->lb_buf;
        if (buf->lb_len < le32_to_cpu(comp_v1->lcm_size)) {


@@ -2058,8 +2064,10 @@ recheck:
                        else if (rc)
                                RETURN(rc);
 
                        else if (rc)
                                RETURN(rc);
 

+                       if (le16_to_cpu(lum->lmm_stripe_count) == 1)
+                               lum->lmm_stripe_count = 0;

                        /* Any stripe count is forbidden on DoM component */
                        /* Any stripe count is forbidden on DoM component */

-                       if (lum->lmm_stripe_count) {
+                       if (lum->lmm_stripe_count > 0) {

                                CDEBUG(D_LAYOUT,
                                       "invalid DoM layout stripe count %u, must be 0\n",
                                       le16_to_cpu(lum->lmm_stripe_count));
                                CDEBUG(D_LAYOUT,
                                       "invalid DoM layout stripe count %u, must be 0\n",
                                       le16_to_cpu(lum->lmm_stripe_count));