Rename LOV_MAGIC_V1_DEF to LOV_MAGIC_V1_DEFINED so that it is not
confused with "_DEFAULT" as one might expect.
Test-Parameters: trivial
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Change-Id: Idb98fc24974a105077bf75bb122006fad34d69e2
Reviewed-on: https://review.whamcloud.com/18888
Tested-by: Jenkins
Reviewed-by: Steve Guminski <stephenx.guminski@intel.com>
Reviewed-by: James Simmons <uja.ornl@yahoo.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
* those *_DEF magics are only used on server side internally, they
* won't be put on wire or disk.
*/
* those *_DEF magics are only used on server side internally, they
* won't be put on wire or disk.
*/
-#define LOV_MAGIC_DEF 0x10000000
-#define LOV_MAGIC_V1_DEF (LOV_MAGIC_DEF | LOV_MAGIC_V1)
-#define LOV_MAGIC_V3_DEF (LOV_MAGIC_DEF | LOV_MAGIC_V3)
-#define LOV_MAGIC_COMP_V1_DEF (LOV_MAGIC_DEF | LOV_MAGIC_COMP_V1)
+#define LOV_MAGIC_DEFINED 0x10000000
+#define LOV_MAGIC_V1_DEFINED (LOV_MAGIC_DEFINED | LOV_MAGIC_V1)
+#define LOV_MAGIC_V3_DEFINED (LOV_MAGIC_DEFINED | LOV_MAGIC_V3)
+#define LOV_MAGIC_COMP_V1_DEFINED (LOV_MAGIC_DEFINED | LOV_MAGIC_COMP_V1)
#define lov_pattern(pattern) (pattern & ~LOV_PATTERN_F_MASK)
#define lov_pattern_flags(pattern) (pattern & LOV_PATTERN_F_MASK)
#define lov_pattern(pattern) (pattern & ~LOV_PATTERN_F_MASK)
#define lov_pattern_flags(pattern) (pattern & LOV_PATTERN_F_MASK)
GOTO(out, rc = -EINVAL);
}
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) {
if (magic != LOV_USER_MAGIC_V1 &&
magic != LOV_USER_MAGIC_V3 &&
magic != LOV_USER_MAGIC_SPECIFIC) {
- 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 &&
if (magic != LOV_USER_MAGIC_V1 &&
magic != LOV_USER_MAGIC_V3 &&
magic != LOV_USER_MAGIC_SPECIFIC &&
if (buf && buf->lb_len) {
struct lov_user_md_v1 *v1 = buf->lb_buf;
if (buf && buf->lb_len) {
struct lov_user_md_v1 *v1 = buf->lb_buf;
- if (v1->lmm_magic != (LOV_MAGIC_DEF | LOV_MAGIC_COMP_V1) &&
- v1->lmm_magic !=
- __swab32(LOV_MAGIC_DEF | LOV_MAGIC_COMP_V1)) {
+ if (v1->lmm_magic != (LOV_MAGIC_DEFINED | LOV_MAGIC_COMP_V1) &&
+ v1->lmm_magic != __swab32(LOV_MAGIC_DEFINED |
+ LOV_MAGIC_COMP_V1)) {
CERROR("%s: the replay buffer of layout extend "
"(magic %#x) does not contain expected "
"composite layout.\n",
CERROR("%s: the replay buffer of layout extend "
"(magic %#x) does not contain expected "
"composite layout.\n",
- magic = le32_to_cpu(v1->lmm_magic) & ~LOV_MAGIC_DEF;
+ magic = le32_to_cpu(v1->lmm_magic) & ~LOV_MAGIC_DEFINED;
if (magic != LOV_MAGIC_V1 && magic != LOV_MAGIC_V3 &&
magic != LOV_MAGIC_COMP_V1)
if (magic != LOV_MAGIC_V1 && magic != LOV_MAGIC_V3 &&
magic != LOV_MAGIC_COMP_V1)
comp_v1 = buf->lb_buf;
magic = v1->lmm_magic;
comp_v1 = buf->lb_buf;
magic = v1->lmm_magic;
- if (unlikely(le32_to_cpu(magic) & LOV_MAGIC_DEF)) {
+ if (unlikely(le32_to_cpu(magic) & LOV_MAGIC_DEFINED)) {
/* try to use as fully defined striping */
rc = lod_use_defined_striping(env, lo, buf);
RETURN(rc);
/* try to use as fully defined striping */
rc = lod_use_defined_striping(env, lo, buf);
RETURN(rc);
} else {
if ((snd_lmm->lmm_magic & cpu_to_le32(LOV_MAGIC_MASK)) ==
cpu_to_le32(LOV_MAGIC_MAGIC))
} else {
if ((snd_lmm->lmm_magic & cpu_to_le32(LOV_MAGIC_MASK)) ==
cpu_to_le32(LOV_MAGIC_MAGIC))
- snd_lmm->lmm_magic |= cpu_to_le32(LOV_MAGIC_DEF);
+ snd_lmm->lmm_magic |= cpu_to_le32(LOV_MAGIC_DEFINED);
else
GOTO(stop, rc = -EPROTO);
}
else
GOTO(stop, rc = -EPROTO);
}
- * please see comment above LOV_MAGIC_V1_DEF
+ * please see comment above LOV_MAGIC_V1_DEFINED
*/
void mdt_fix_lov_magic(struct mdt_thread_info *info, void *eadata)
{
*/
void mdt_fix_lov_magic(struct mdt_thread_info *info, void *eadata)
{
if (unlikely(req_is_replay(mdt_info_req(info)))) {
if ((v1->lmm_magic & LOV_MAGIC_MASK) == LOV_MAGIC_MAGIC)
if (unlikely(req_is_replay(mdt_info_req(info)))) {
if ((v1->lmm_magic & LOV_MAGIC_MASK) == LOV_MAGIC_MAGIC)
- v1->lmm_magic |= LOV_MAGIC_DEF;
+ v1->lmm_magic |= LOV_MAGIC_DEFINED;
else if ((v1->lmm_magic & __swab32(LOV_MAGIC_MAGIC)) ==
__swab32(LOV_MAGIC_MAGIC))
else if ((v1->lmm_magic & __swab32(LOV_MAGIC_MAGIC)) ==
__swab32(LOV_MAGIC_MAGIC))
- v1->lmm_magic |= __swab32(LOV_MAGIC_DEF);
+ v1->lmm_magic |= __swab32(LOV_MAGIC_DEFINED);
- if (lmm->lmm_magic == cpu_to_le32(LOV_MAGIC_COMP_V1_DEF)) {
+ if (lmm->lmm_magic == cpu_to_le32(LOV_MAGIC_COMP_V1_DEFINED)) {
comp_v1 = (struct lov_comp_md_v1 *)lmm;
if (comp_v1->lcm_entry_count == 0)
comp_v1 = (struct lov_comp_md_v1 *)lmm;
if (comp_v1->lcm_entry_count == 0)
if (!(ma->ma_valid & MA_LOV)) {
/* Even empty file are released */
memset(ma->ma_lmm, 0, sizeof(*ma->ma_lmm));
if (!(ma->ma_valid & MA_LOV)) {
/* Even empty file are released */
memset(ma->ma_lmm, 0, sizeof(*ma->ma_lmm));
- ma->ma_lmm->lmm_magic = cpu_to_le32(LOV_MAGIC_V1_DEF);
+ ma->ma_lmm->lmm_magic = cpu_to_le32(LOV_MAGIC_V1_DEFINED);
ma->ma_lmm->lmm_pattern = cpu_to_le32(LOV_PATTERN_RAID0);
ma->ma_lmm->lmm_stripe_size = cpu_to_le32(LOV_MIN_STRIPE_SIZE);
ma->ma_lmm_size = sizeof(*ma->ma_lmm);
} else {
ma->ma_lmm->lmm_pattern = cpu_to_le32(LOV_PATTERN_RAID0);
ma->ma_lmm->lmm_stripe_size = cpu_to_le32(LOV_MIN_STRIPE_SIZE);
ma->ma_lmm_size = sizeof(*ma->ma_lmm);
} else {
- /* Magic must be LOV_MAGIC_*_DEF otherwise LOD will interpret
+ /* Magic must be LOV_MAGIC_*_DEFINED or LOD will interpret
* ma_lmm as lov_user_md, then it will be confused by union of
* layout_gen and stripe_offset. */
if ((le32_to_cpu(ma->ma_lmm->lmm_magic) & LOV_MAGIC_MASK) ==
LOV_MAGIC_MAGIC)
* ma_lmm as lov_user_md, then it will be confused by union of
* layout_gen and stripe_offset. */
if ((le32_to_cpu(ma->ma_lmm->lmm_magic) & LOV_MAGIC_MASK) ==
LOV_MAGIC_MAGIC)
- ma->ma_lmm->lmm_magic |= cpu_to_le32(LOV_MAGIC_DEF);
+ ma->ma_lmm->lmm_magic |= cpu_to_le32(LOV_MAGIC_DEFINED);
else
GOTO(out_unlock, rc = -EINVAL);
}
else
GOTO(out_unlock, rc = -EINVAL);
}