From dce487f53a6f7835561df57a0489c6dbaed33fb1 Mon Sep 17 00:00:00 2001 From: Shaun Tancheff Date: Sun, 4 Dec 2022 22:39:03 -0600 Subject: [PATCH] LU-16366 build: Add LCME_FL_PARITY to wirecheck - OBD_MD_DOM_SIZE: Should use 0x instead of 0X for consistency. - LCME_FL_PARITY should be included in wirecheck and wiretest - QIF_DQBLKSIZE_BITS used where QIF_DQBLKSIZE is expected Test-Parameters: trivial Fixes: 4c47900889 ("LU-12186 ec: add necessary structure member for EC file") Signed-off-by: Shaun Tancheff Change-Id: Ic2eecfc2b1945b5b249bb341f791a99c5b109b97 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/49311 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Arshad Hussain Reviewed-by: Oleg Drokin --- lustre/include/uapi/linux/lustre/lustre_idl.h | 2 +- lustre/ptlrpc/wiretest.c | 1 + lustre/utils/wirecheck.c | 1 + lustre/utils/wiretest.c | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lustre/include/uapi/linux/lustre/lustre_idl.h b/lustre/include/uapi/linux/lustre/lustre_idl.h index 5fb89c8..bc93164 100644 --- a/lustre/include/uapi/linux/lustre/lustre_idl.h +++ b/lustre/include/uapi/linux/lustre/lustre_idl.h @@ -1279,7 +1279,7 @@ lov_mds_md_max_stripe_count(__kernel_size_t buf_size, __u32 lmm_magic) #define OBD_MD_FLUID (0x00000200ULL) /* user ID */ #define OBD_MD_FLGID (0x00000400ULL) /* group ID */ #define OBD_MD_FLFLAGS (0x00000800ULL) /* flags word */ -#define OBD_MD_DOM_SIZE (0X00001000ULL) /* Data-on-MDT component size */ +#define OBD_MD_DOM_SIZE (0x00001000ULL) /* Data-on-MDT component size */ #define OBD_MD_FLNLINK (0x00002000ULL) /* link count */ #define OBD_MD_FLPARENT (0x00004000ULL) /* parent FID */ #define OBD_MD_LAYOUT_VERSION (0x00008000ULL) /* OST object layout version */ diff --git a/lustre/ptlrpc/wiretest.c b/lustre/ptlrpc/wiretest.c index 29a5776..6747116 100644 --- a/lustre/ptlrpc/wiretest.c +++ b/lustre/ptlrpc/wiretest.c @@ -1841,6 +1841,7 @@ void lustre_assert_wire_constants(void) BUILD_BUG_ON(LCME_FL_INIT != 0x00000010); BUILD_BUG_ON(LCME_FL_NOSYNC != 0x00000020); BUILD_BUG_ON(LCME_FL_EXTENSION != 0x00000040); + BUILD_BUG_ON(LCME_FL_PARITY != 0x00000080); BUILD_BUG_ON(LCME_FL_NEG != 0x80000000); /* Checks for struct lov_comp_md_v1 */ diff --git a/lustre/utils/wirecheck.c b/lustre/utils/wirecheck.c index 85c6893..0fa9a895 100644 --- a/lustre/utils/wirecheck.c +++ b/lustre/utils/wirecheck.c @@ -867,6 +867,7 @@ check_lov_comp_md_entry_v1(void) CHECK_CVALUE_X(LCME_FL_INIT); CHECK_CVALUE_X(LCME_FL_NOSYNC); CHECK_CVALUE_X(LCME_FL_EXTENSION); + CHECK_CVALUE_X(LCME_FL_PARITY); CHECK_CVALUE_X(LCME_FL_NEG); } diff --git a/lustre/utils/wiretest.c b/lustre/utils/wiretest.c index 7517748..53b59d3 100644 --- a/lustre/utils/wiretest.c +++ b/lustre/utils/wiretest.c @@ -2110,7 +2110,7 @@ void lustre_assert_wire_constants(void) LASSERTF(QIF_DQBLKSIZE_BITS == 10, "found %lld\n", (long long)QIF_DQBLKSIZE_BITS); LASSERTF(QIF_DQBLKSIZE == 1024, "found %lld\n", - (long long)QIF_DQBLKSIZE_BITS); + (long long)QIF_DQBLKSIZE); /* Checks for struct obd_quotactl */ LASSERTF((int)sizeof(struct obd_quotactl) == 112, "found %lld\n", -- 1.8.3.1