LU-3285 merge: 'dom' branch merging

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

diff --git a/lustre/lod/lod_lov.c b/lustre/lod/lod_lov.c
index 663cbb2..f5df58d 100644 (file)
--- a/lustre/lod/lod_lov.c
+++ b/lustre/lod/lod_lov.c
@@ -1513,7 +1513,7 @@ static int lod_verify_v1v3(struct lod_device *d, const struct lu_buf *buf,
                GOTO(out, rc = -EINVAL);
        }
 
-       magic = le32_to_cpu(lum->lmm_magic) & ~LOV_MAGIC_DEF;
+       magic = le32_to_cpu(lum->lmm_magic) & ~LOV_MAGIC_DEFINED;
        if (magic != LOV_USER_MAGIC_V1 &&
            magic != LOV_USER_MAGIC_V3 &&
            magic != LOV_USER_MAGIC_SPECIFIC) {
@@ -1640,7 +1640,7 @@ int lod_verify_striping(struct lod_device *d, const struct lu_buf *buf,
                RETURN(-EINVAL);
        }
 
-       magic = le32_to_cpu(lum->lmm_magic) & ~LOV_MAGIC_DEF;
+       magic = le32_to_cpu(lum->lmm_magic) & ~LOV_MAGIC_DEFINED;
        if (magic != LOV_USER_MAGIC_V1 &&
            magic != LOV_USER_MAGIC_V3 &&
            magic != LOV_USER_MAGIC_SPECIFIC &&