LU-16677 utils: synchronize wirecheck.c and wiretest.c

wirecheck.c is not compilable and out of sync with
wiretest.c.
The patch adds forgotten changes to wirecheck.c and
replaces wiretest.c by a version generated by
"make newwiretest".

Test-Parameters: trivial
Signed-off-by: Alexander Zarochentsev <alexander.zarochentsev@hpe.com>
Change-Id: I22cc75b02e163ce3ca743be608ec334c85129b4c
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/50456
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andrew Perepechko <andrew.perepechko@hpe.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Sebastien Buisson <sbuisson@ddn.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre/ptlrpc/wiretest.c b/lustre/ptlrpc/wiretest.c
index 9601e1c..f9dda74 100644 (file)
--- a/lustre/ptlrpc/wiretest.c
+++ b/lustre/ptlrpc/wiretest.c
@@ -1598,7 +1598,7 @@ void lustre_assert_wire_constants(void)
                 OBD_MD_FLGID);
        LASSERTF(OBD_MD_FLFLAGS == (0x00000800ULL), "found 0x%.16llxULL\n",
                 OBD_MD_FLFLAGS);
-       LASSERTF(OBD_MD_DOM_SIZE == (0X00001000ULL), "found 0x%.16llxULL\n",
+       LASSERTF(OBD_MD_DOM_SIZE == (0x00001000ULL), "found 0x%.16llxULL\n",
                 OBD_MD_DOM_SIZE);
        LASSERTF(OBD_MD_FLNLINK == (0x00002000ULL), "found 0x%.16llxULL\n",
                 OBD_MD_FLNLINK);
@@ -5405,7 +5405,6 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct gss_wire_ctx, gw_handle));
        LASSERTF((int)sizeof(((struct gss_wire_ctx *)0)->gw_handle) == 16, "found %lld\n",
                 (long long)(int)sizeof(((struct gss_wire_ctx *)0)->gw_handle));
-
 #ifdef HAVE_SERVER_SUPPORT
 
        /* Checks for struct object_update_param */
@@ -5576,8 +5575,6 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct nodemap_cluster_rec, ncr_name[16 + 1]));
        LASSERTF((int)sizeof(((struct nodemap_cluster_rec *)0)->ncr_name[16 + 1]) == 1, "found %lld\n",
                 (long long)(int)sizeof(((struct nodemap_cluster_rec *)0)->ncr_name[16 + 1]));
-       /* ncr_flags' address and size cannot be taken because it is a bit-field (8 bits) */
-       /* ncr_flags2' address and size cannot be taken because it is a bit-field (8 bits) */
        LASSERTF((int)offsetof(struct nodemap_cluster_rec, ncr_padding1) == 19, "found %lld\n",
                 (long long)(int)offsetof(struct nodemap_cluster_rec, ncr_padding1));
        LASSERTF((int)sizeof(((struct nodemap_cluster_rec *)0)->ncr_padding1) == 1, "found %lld\n",
@@ -5736,28 +5733,28 @@ void lustre_assert_wire_constants(void)
                 (long long)NODEMAP_CLUSTER_REC);
        LASSERTF(NODEMAP_CLUSTER_ROLES == 1, "found %lld\n",
                 (long long)NODEMAP_CLUSTER_ROLES);
-       LASSERTF(NM_TYPE_MASK == 0x0FFFFFFFUL, "found 0x%.8llxUL\n",
-                (long long)NM_TYPE_MASK);
+       LASSERTF(NM_TYPE_MASK == 0x0fffffffUL, "found 0x%.8xUL\n",
+               (unsigned)NM_TYPE_MASK);
        LASSERTF(NM_TYPE_SHIFT == 28, "found %lld\n",
                 (long long)NM_TYPE_SHIFT);
-       LASSERTF(NM_FL_ALLOW_ROOT_ACCESS == 0x00000001UL, "found 0x%.8llxUL\n",
-                (long long)NM_FL_ALLOW_ROOT_ACCESS);
-       LASSERTF(NM_FL_TRUST_CLIENT_IDS == 0x00000002UL, "found 0x%.8llxUL\n",
-                (long long)NM_FL_TRUST_CLIENT_IDS);
-       LASSERTF(NM_FL_DENY_UNKNOWN == 0x00000004UL, "found 0x%.8llxUL\n",
-                (long long)NM_FL_DENY_UNKNOWN);
-       LASSERTF(NM_FL_MAP_UID == 0x00000008UL, "found 0x%.8llxUL\n",
-                (long long)NM_FL_MAP_UID);
-       LASSERTF(NM_FL_MAP_GID == 0x00000010UL, "found 0x%.8llxUL\n",
-                (long long)NM_FL_MAP_GID);
-       LASSERTF(NM_FL_ENABLE_AUDIT == 0x00000020UL, "found 0x%.8llxUL\n",
-                (long long)NM_FL_ENABLE_AUDIT);
-       LASSERTF(NM_FL_FORBID_ENCRYPT == 0x00000040UL, "found 0x%.8llxUL\n",
-                (long long)NM_FL_FORBID_ENCRYPT);
-       LASSERTF(NM_FL_MAP_PROJID == 0x00000080UL, "found 0x%.8llxUL\n",
-                (long long)NM_FL_MAP_PROJID);
-       LASSERTF(NM_FL2_READONLY_MOUNT == 0x00000001UL, "found 0x%.8llxUL\n",
-                (long long)NM_FL2_READONLY_MOUNT);
+       LASSERTF(NM_FL_ALLOW_ROOT_ACCESS == 0x00000001UL, "found 0x%.8xUL\n",
+               (unsigned)NM_FL_ALLOW_ROOT_ACCESS);
+       LASSERTF(NM_FL_TRUST_CLIENT_IDS == 0x00000002UL, "found 0x%.8xUL\n",
+               (unsigned)NM_FL_TRUST_CLIENT_IDS);
+       LASSERTF(NM_FL_DENY_UNKNOWN == 0x00000004UL, "found 0x%.8xUL\n",
+               (unsigned)NM_FL_DENY_UNKNOWN);
+       LASSERTF(NM_FL_MAP_UID == 0x00000008UL, "found 0x%.8xUL\n",
+               (unsigned)NM_FL_MAP_UID);
+       LASSERTF(NM_FL_MAP_GID == 0x00000010UL, "found 0x%.8xUL\n",
+               (unsigned)NM_FL_MAP_GID);
+       LASSERTF(NM_FL_ENABLE_AUDIT == 0x00000020UL, "found 0x%.8xUL\n",
+               (unsigned)NM_FL_ENABLE_AUDIT);
+       LASSERTF(NM_FL_FORBID_ENCRYPT == 0x00000040UL, "found 0x%.8xUL\n",
+               (unsigned)NM_FL_FORBID_ENCRYPT);
+       LASSERTF(NM_FL_MAP_PROJID == 0x00000080UL, "found 0x%.8xUL\n",
+               (unsigned)NM_FL_MAP_PROJID);
+       LASSERTF(NM_FL2_READONLY_MOUNT == 0x00000001UL, "found 0x%.8xUL\n",
+               (unsigned)NM_FL2_READONLY_MOUNT);
        LASSERTF(NODEMAP_UID == 0, "found %lld\n",
                 (long long)NODEMAP_UID);
        LASSERTF(NODEMAP_GID == 1, "found %lld\n",
@@ -5768,34 +5765,34 @@ void lustre_assert_wire_constants(void)
                 (long long)NODEMAP_FS_TO_CLIENT);
        LASSERTF(NODEMAP_CLIENT_TO_FS == 1, "found %lld\n",
                 (long long)NODEMAP_CLIENT_TO_FS);
-       LASSERTF(NODEMAP_MAP_BOTH_LEGACY == 0x00000000UL, "found 0x%.8llxUL\n",
-                (long long)NODEMAP_MAP_BOTH_LEGACY);
-       LASSERTF(NODEMAP_MAP_UID == 0x00000001UL, "found 0x%.8llxUL\n",
-                (long long)NODEMAP_MAP_UID);
-       LASSERTF(NODEMAP_MAP_GID == 0x00000002UL, "found 0x%.8llxUL\n",
-                (long long)NODEMAP_MAP_GID);
-       LASSERTF(NODEMAP_MAP_BOTH == 0x00000003UL, "found 0x%.8llxUL\n",
-                (long long)NODEMAP_MAP_BOTH);
-       LASSERTF(NODEMAP_MAP_PROJID == 0x00000004UL, "found 0x%.8llxUL\n",
-                (long long)NODEMAP_MAP_PROJID);
-       LASSERTF(NODEMAP_MAP_ALL == 0x00000007UL, "found 0x%.8llxUL\n",
-                (long long)NODEMAP_MAP_ALL);
-       LASSERTF(NODEMAP_RBAC_FILE_PERMS == 0x00000001UL, "found 0x%.8llxUL\n",
-                (long long)NODEMAP_RBAC_FILE_PERMS);
-       LASSERTF(NODEMAP_RBAC_DNE_OPS == 0x00000002UL, "found 0x%.8llxUL\n",
-                (long long)NODEMAP_RBAC_DNE_OPS);
-       LASSERTF(NODEMAP_RBAC_QUOTA_OPS == 0x00000004UL, "found 0x%.8llxUL\n",
-                (long long)NODEMAP_RBAC_QUOTA_OPS);
-       LASSERTF(NODEMAP_RBAC_BYFID_OPS == 0x00000008UL, "found 0x%.8llxUL\n",
-                (long long)NODEMAP_RBAC_BYFID_OPS);
-       LASSERTF(NODEMAP_RBAC_CHLG_OPS == 0x00000010UL, "found 0x%.8llxUL\n",
-                (long long)NODEMAP_RBAC_CHLG_OPS);
-       LASSERTF(NODEMAP_RBAC_FSCRYPT_ADMIN == 0x00000020UL, "found 0x%.8llxUL\n",
-                (long long)NODEMAP_RBAC_FSCRYPT_ADMIN);
-       LASSERTF(NODEMAP_RBAC_NONE == 0xFFFFFFC0UL, "found 0x%.8llxUL\n",
-                (long long)NODEMAP_RBAC_NONE);
-       LASSERTF(NODEMAP_RBAC_ALL == 0xFFFFFFFFUL, "found 0x%.8llxUL\n",
-                (long long)NODEMAP_RBAC_ALL);
+       LASSERTF(NODEMAP_MAP_BOTH_LEGACY == 0x00000000UL, "found 0x%.8xUL\n",
+               (unsigned)NODEMAP_MAP_BOTH_LEGACY);
+       LASSERTF(NODEMAP_MAP_UID == 0x00000001UL, "found 0x%.8xUL\n",
+               (unsigned)NODEMAP_MAP_UID);
+       LASSERTF(NODEMAP_MAP_GID == 0x00000002UL, "found 0x%.8xUL\n",
+               (unsigned)NODEMAP_MAP_GID);
+       LASSERTF(NODEMAP_MAP_BOTH == 0x00000003UL, "found 0x%.8xUL\n",
+               (unsigned)NODEMAP_MAP_BOTH);
+       LASSERTF(NODEMAP_MAP_PROJID == 0x00000004UL, "found 0x%.8xUL\n",
+               (unsigned)NODEMAP_MAP_PROJID);
+       LASSERTF(NODEMAP_MAP_ALL == 0x00000007UL, "found 0x%.8xUL\n",
+               (unsigned)NODEMAP_MAP_ALL);
+       LASSERTF(NODEMAP_RBAC_FILE_PERMS == 0x00000001UL, "found 0x%.8xUL\n",
+               (unsigned)NODEMAP_RBAC_FILE_PERMS);
+       LASSERTF(NODEMAP_RBAC_DNE_OPS == 0x00000002UL, "found 0x%.8xUL\n",
+               (unsigned)NODEMAP_RBAC_DNE_OPS);
+       LASSERTF(NODEMAP_RBAC_QUOTA_OPS == 0x00000004UL, "found 0x%.8xUL\n",
+               (unsigned)NODEMAP_RBAC_QUOTA_OPS);
+       LASSERTF(NODEMAP_RBAC_BYFID_OPS == 0x00000008UL, "found 0x%.8xUL\n",
+               (unsigned)NODEMAP_RBAC_BYFID_OPS);
+       LASSERTF(NODEMAP_RBAC_CHLG_OPS == 0x00000010UL, "found 0x%.8xUL\n",
+               (unsigned)NODEMAP_RBAC_CHLG_OPS);
+       LASSERTF(NODEMAP_RBAC_FSCRYPT_ADMIN == 0x00000020UL, "found 0x%.8xUL\n",
+               (unsigned)NODEMAP_RBAC_FSCRYPT_ADMIN);
+       LASSERTF(NODEMAP_RBAC_NONE == 0xffffffc0UL, "found 0x%.8xUL\n",
+               (unsigned)NODEMAP_RBAC_NONE);
+       LASSERTF(NODEMAP_RBAC_ALL == 0xffffffffUL, "found 0x%.8xUL\n",
+               (unsigned)NODEMAP_RBAC_ALL);
 
        LASSERTF(OFD_ACCESS_READ == 0x00000001UL, "found 0x%.8xUL\n",
                (unsigned)OFD_ACCESS_READ);
@@ -6195,9 +6192,9 @@ void lustre_assert_wire_constants(void)
        LASSERTF(LCFG_NODEMAP_ADMIN == 0x000ce049UL, "found 0x%.8xUL\n",
                (unsigned)LCFG_NODEMAP_ADMIN);
        LASSERTF(LCFG_NODEMAP_ADD_PROJIDMAP == 0x000ce04aUL, "found 0x%.8xUL\n",
-                (unsigned)LCFG_NODEMAP_ADD_PROJIDMAP);
+               (unsigned)LCFG_NODEMAP_ADD_PROJIDMAP);
        LASSERTF(LCFG_NODEMAP_DEL_PROJIDMAP == 0x000ce04bUL, "found 0x%.8xUL\n",
-                (unsigned)LCFG_NODEMAP_DEL_PROJIDMAP);
+               (unsigned)LCFG_NODEMAP_DEL_PROJIDMAP);
        LASSERTF(LCFG_NODEMAP_TRUSTED == 0x000ce050UL, "found 0x%.8xUL\n",
                (unsigned)LCFG_NODEMAP_TRUSTED);
        LASSERTF(LCFG_NODEMAP_SQUASH_UID == 0x000ce051UL, "found 0x%.8xUL\n",
@@ -6223,13 +6220,13 @@ void lustre_assert_wire_constants(void)
        LASSERTF(LCFG_NODEMAP_SET_SEPOL == 0x000ce05bUL, "found 0x%.8xUL\n",
                (unsigned)LCFG_NODEMAP_SET_SEPOL);
        LASSERTF(LCFG_NODEMAP_FORBID_ENCRYPT == 0x000ce05cUL, "found 0x%.8xUL\n",
-                (unsigned)LCFG_NODEMAP_FORBID_ENCRYPT);
+               (unsigned)LCFG_NODEMAP_FORBID_ENCRYPT);
        LASSERTF(LCFG_NODEMAP_SQUASH_PROJID == 0x000ce05dUL, "found 0x%.8xUL\n",
-                (unsigned)LCFG_NODEMAP_SQUASH_PROJID);
+               (unsigned)LCFG_NODEMAP_SQUASH_PROJID);
        LASSERTF(LCFG_NODEMAP_READONLY_MOUNT == 0x000ce05eUL, "found 0x%.8xUL\n",
-                (unsigned)LCFG_NODEMAP_READONLY_MOUNT);
+               (unsigned)LCFG_NODEMAP_READONLY_MOUNT);
        LASSERTF(LCFG_NODEMAP_RBAC == 0x000ce05fUL, "found 0x%.8xUL\n",
-                (unsigned)LCFG_NODEMAP_RBAC);
+               (unsigned)LCFG_NODEMAP_RBAC);
 #endif /* HAVE_SERVER_SUPPORT */
        LASSERTF(PORTALS_CFG_TYPE == 1, "found %lld\n",
                 (long long)PORTALS_CFG_TYPE);

diff --git a/lustre/utils/wirecheck.c b/lustre/utils/wirecheck.c
index faf8a65..4c43719 100644 (file)
--- a/lustre/utils/wirecheck.c
+++ b/lustre/utils/wirecheck.c
@@ -416,7 +416,7 @@ check_lustre_msg_v2(void)
        CHECK_MEMBER(lustre_msg_v2, lm_repsize);
        CHECK_MEMBER(lustre_msg_v2, lm_cksum);
        CHECK_MEMBER(lustre_msg_v2, lm_flags);
-       CHECK_MEMBER(lustre_msg_v2, lm_padding_2);
+       CHECK_MEMBER(lustre_msg_v2, lm_opc);
        CHECK_MEMBER(lustre_msg_v2, lm_padding_3);
        CHECK_MEMBER(lustre_msg_v2, lm_buflens[0]);
 
@@ -1106,7 +1106,7 @@ check_niobuf_remote(void)
        CHECK_DEFINE_X(OBD_BRW_OVER_PRJQUOTA);
        CHECK_DEFINE_X(OBD_BRW_RDMA_ONLY);
        CHECK_DEFINE_X(OBD_BRW_SYS_RESOURCE);
-       CHECK_DEFINE_X(OBD_BRW_SYS_COMPRESSED);
+       CHECK_DEFINE_X(OBD_BRW_COMPRESSED);
 }
 
 static void
@@ -2645,8 +2645,10 @@ static void check_nodemap_cluster_rec(void)
        CHECK_STRUCT(nodemap_cluster_rec);
        CHECK_CDEFINE(LUSTRE_NODEMAP_NAME_LENGTH);
        CHECK_MEMBER(nodemap_cluster_rec, ncr_name[LUSTRE_NODEMAP_NAME_LENGTH + 1]);
+#if 0 /* cannot check offset of 8-bit bitfield */
        CHECK_MEMBER(nodemap_cluster_rec, ncr_flags);
        CHECK_MEMBER(nodemap_cluster_rec, ncr_flags2);
+#endif
        CHECK_MEMBER(nodemap_cluster_rec, ncr_padding1);
        CHECK_MEMBER(nodemap_cluster_rec, ncr_squash_projid);
        CHECK_MEMBER(nodemap_cluster_rec, ncr_squash_uid);
@@ -2708,6 +2710,10 @@ static void check_nodemap_key(void)
        BLANK_LINE();
        CHECK_STRUCT(nodemap_key);
        CHECK_MEMBER(nodemap_key, nk_nodemap_id);
+       CHECK_MEMBER(nodemap_key, nk_cluster_subid);
+       CHECK_MEMBER(nodemap_key, nk_range_id);
+       CHECK_MEMBER(nodemap_key, nk_id_client);
+       CHECK_MEMBER(nodemap_key, nk_unused);
 
        CHECK_VALUE(NODEMAP_EMPTY_IDX);
        CHECK_VALUE(NODEMAP_CLUSTER_IDX);

diff --git a/lustre/utils/wiretest.c b/lustre/utils/wiretest.c
index d242db4..c2118ea 100644 (file)
--- a/lustre/utils/wiretest.c
+++ b/lustre/utils/wiretest.c
@@ -5240,7 +5240,6 @@ void lustre_assert_wire_constants(void)
        LASSERTF((int)sizeof(((struct hsm_user_import *)0)->hui_archive_id) == 4, "found %lld\n",
                 (long long)(int)sizeof(((struct hsm_user_import *)0)->hui_archive_id));
 
-#ifndef HAVE_NATIVE_LINUX_CLIENT
        /* Checks for struct netobj_s */
        LASSERTF((int)sizeof(struct netobj_s) == 4, "found %lld\n",
                 (long long)(int)sizeof(struct netobj_s));
@@ -5432,8 +5431,6 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct gss_wire_ctx, gw_handle));
        LASSERTF((int)sizeof(((struct gss_wire_ctx *)0)->gw_handle) == 16, "found %lld\n",
                 (long long)(int)sizeof(((struct gss_wire_ctx *)0)->gw_handle));
-#endif /* !HAVE_NATIVE_LINUX_CLIENT */
-
 #ifdef HAVE_SERVER_SUPPORT
 
        /* Checks for struct object_update_param */
@@ -5604,8 +5601,6 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct nodemap_cluster_rec, ncr_name[16 + 1]));
        LASSERTF((int)sizeof(((struct nodemap_cluster_rec *)0)->ncr_name[16 + 1]) == 1, "found %lld\n",
                 (long long)(int)sizeof(((struct nodemap_cluster_rec *)0)->ncr_name[16 + 1]));
-       /* ncr_flags' address and size cannot be taken because it is a bit-field (8 bits) */
-       /* ncr_flags2' address and size cannot be taken because it is a bit-field (8 bits) */
        LASSERTF((int)offsetof(struct nodemap_cluster_rec, ncr_padding1) == 19, "found %lld\n",
                 (long long)(int)offsetof(struct nodemap_cluster_rec, ncr_padding1));
        LASSERTF((int)sizeof(((struct nodemap_cluster_rec *)0)->ncr_padding1) == 1, "found %lld\n",
@@ -5764,28 +5759,28 @@ void lustre_assert_wire_constants(void)
                 (long long)NODEMAP_CLUSTER_REC);
        LASSERTF(NODEMAP_CLUSTER_ROLES == 1, "found %lld\n",
                 (long long)NODEMAP_CLUSTER_ROLES);
-       LASSERTF(NM_TYPE_MASK == 0x0FFFFFFFUL, "found 0x%.8llxUL\n",
-                (long long)NM_TYPE_MASK);
+       LASSERTF(NM_TYPE_MASK == 0x0fffffffUL, "found 0x%.8xUL\n",
+               (unsigned)NM_TYPE_MASK);
        LASSERTF(NM_TYPE_SHIFT == 28, "found %lld\n",
                 (long long)NM_TYPE_SHIFT);
-       LASSERTF(NM_FL_ALLOW_ROOT_ACCESS == 0x00000001UL, "found 0x%.8llxUL\n",
-                (long long)NM_FL_ALLOW_ROOT_ACCESS);
-       LASSERTF(NM_FL_TRUST_CLIENT_IDS == 0x00000002UL, "found 0x%.8llxUL\n",
-                (long long)NM_FL_TRUST_CLIENT_IDS);
-       LASSERTF(NM_FL_DENY_UNKNOWN == 0x00000004UL, "found 0x%.8llxUL\n",
-                (long long)NM_FL_DENY_UNKNOWN);
-       LASSERTF(NM_FL_MAP_UID == 0x00000008UL, "found 0x%.8llxUL\n",
-                (long long)NM_FL_MAP_UID);
-       LASSERTF(NM_FL_MAP_GID == 0x00000010UL, "found 0x%.8llxUL\n",
-                (long long)NM_FL_MAP_GID);
-       LASSERTF(NM_FL_ENABLE_AUDIT == 0x00000020UL, "found 0x%.8llxUL\n",
-                (long long)NM_FL_ENABLE_AUDIT);
-       LASSERTF(NM_FL_FORBID_ENCRYPT == 0x00000040UL, "found 0x%.8llxUL\n",
-                (long long)NM_FL_FORBID_ENCRYPT);
-       LASSERTF(NM_FL_MAP_PROJID == 0x00000080UL, "found 0x%.8llxUL\n",
-                (long long)NM_FL_MAP_PROJID);
-       LASSERTF(NM_FL2_READONLY_MOUNT == 0x00000001UL, "found 0x%.8llxUL\n",
-                (long long)NM_FL2_READONLY_MOUNT);
+       LASSERTF(NM_FL_ALLOW_ROOT_ACCESS == 0x00000001UL, "found 0x%.8xUL\n",
+               (unsigned)NM_FL_ALLOW_ROOT_ACCESS);
+       LASSERTF(NM_FL_TRUST_CLIENT_IDS == 0x00000002UL, "found 0x%.8xUL\n",
+               (unsigned)NM_FL_TRUST_CLIENT_IDS);
+       LASSERTF(NM_FL_DENY_UNKNOWN == 0x00000004UL, "found 0x%.8xUL\n",
+               (unsigned)NM_FL_DENY_UNKNOWN);
+       LASSERTF(NM_FL_MAP_UID == 0x00000008UL, "found 0x%.8xUL\n",
+               (unsigned)NM_FL_MAP_UID);
+       LASSERTF(NM_FL_MAP_GID == 0x00000010UL, "found 0x%.8xUL\n",
+               (unsigned)NM_FL_MAP_GID);
+       LASSERTF(NM_FL_ENABLE_AUDIT == 0x00000020UL, "found 0x%.8xUL\n",
+               (unsigned)NM_FL_ENABLE_AUDIT);
+       LASSERTF(NM_FL_FORBID_ENCRYPT == 0x00000040UL, "found 0x%.8xUL\n",
+               (unsigned)NM_FL_FORBID_ENCRYPT);
+       LASSERTF(NM_FL_MAP_PROJID == 0x00000080UL, "found 0x%.8xUL\n",
+               (unsigned)NM_FL_MAP_PROJID);
+       LASSERTF(NM_FL2_READONLY_MOUNT == 0x00000001UL, "found 0x%.8xUL\n",
+               (unsigned)NM_FL2_READONLY_MOUNT);
        LASSERTF(NODEMAP_UID == 0, "found %lld\n",
                 (long long)NODEMAP_UID);
        LASSERTF(NODEMAP_GID == 1, "found %lld\n",
@@ -5796,34 +5791,34 @@ void lustre_assert_wire_constants(void)
                 (long long)NODEMAP_FS_TO_CLIENT);
        LASSERTF(NODEMAP_CLIENT_TO_FS == 1, "found %lld\n",
                 (long long)NODEMAP_CLIENT_TO_FS);
-       LASSERTF(NODEMAP_MAP_BOTH_LEGACY == 0x00000000UL, "found 0x%.8llxUL\n",
-                (long long)NODEMAP_MAP_BOTH_LEGACY);
-       LASSERTF(NODEMAP_MAP_UID == 0x00000001UL, "found 0x%.8llxUL\n",
-                (long long)NODEMAP_MAP_UID);
-       LASSERTF(NODEMAP_MAP_GID == 0x00000002UL, "found 0x%.8llxUL\n",
-                (long long)NODEMAP_MAP_GID);
-       LASSERTF(NODEMAP_MAP_BOTH == 0x00000003UL, "found 0x%.8llxUL\n",
-                (long long)NODEMAP_MAP_BOTH);
-       LASSERTF(NODEMAP_MAP_PROJID == 0x00000004UL, "found 0x%.8llxUL\n",
-                (long long)NODEMAP_MAP_PROJID);
-       LASSERTF(NODEMAP_MAP_ALL == 0x00000007UL, "found 0x%.8llxUL\n",
-                (long long)NODEMAP_MAP_ALL);
-       LASSERTF(NODEMAP_RBAC_FILE_PERMS == 0x00000001UL, "found 0x%.8llxUL\n",
-                (long long)NODEMAP_RBAC_FILE_PERMS);
-       LASSERTF(NODEMAP_RBAC_DNE_OPS == 0x00000002UL, "found 0x%.8llxUL\n",
-                (long long)NODEMAP_RBAC_DNE_OPS);
-       LASSERTF(NODEMAP_RBAC_QUOTA_OPS == 0x00000004UL, "found 0x%.8llxUL\n",
-                (long long)NODEMAP_RBAC_QUOTA_OPS);
-       LASSERTF(NODEMAP_RBAC_BYFID_OPS == 0x00000008UL, "found 0x%.8llxUL\n",
-                (long long)NODEMAP_RBAC_BYFID_OPS);
-       LASSERTF(NODEMAP_RBAC_CHLG_OPS == 0x00000010UL, "found 0x%.8llxUL\n",
-                (long long)NODEMAP_RBAC_CHLG_OPS);
-       LASSERTF(NODEMAP_RBAC_FSCRYPT_ADMIN == 0x00000020UL, "found 0x%.8llxUL\n",
-                (long long)NODEMAP_RBAC_FSCRYPT_ADMIN);
-       LASSERTF(NODEMAP_RBAC_NONE == 0xFFFFFFC0UL, "found 0x%.8llxUL\n",
-                (long long)NODEMAP_RBAC_NONE);
-       LASSERTF(NODEMAP_RBAC_ALL == 0xFFFFFFFFUL, "found 0x%.8llxUL\n",
-                (long long)NODEMAP_RBAC_ALL);
+       LASSERTF(NODEMAP_MAP_BOTH_LEGACY == 0x00000000UL, "found 0x%.8xUL\n",
+               (unsigned)NODEMAP_MAP_BOTH_LEGACY);
+       LASSERTF(NODEMAP_MAP_UID == 0x00000001UL, "found 0x%.8xUL\n",
+               (unsigned)NODEMAP_MAP_UID);
+       LASSERTF(NODEMAP_MAP_GID == 0x00000002UL, "found 0x%.8xUL\n",
+               (unsigned)NODEMAP_MAP_GID);
+       LASSERTF(NODEMAP_MAP_BOTH == 0x00000003UL, "found 0x%.8xUL\n",
+               (unsigned)NODEMAP_MAP_BOTH);
+       LASSERTF(NODEMAP_MAP_PROJID == 0x00000004UL, "found 0x%.8xUL\n",
+               (unsigned)NODEMAP_MAP_PROJID);
+       LASSERTF(NODEMAP_MAP_ALL == 0x00000007UL, "found 0x%.8xUL\n",
+               (unsigned)NODEMAP_MAP_ALL);
+       LASSERTF(NODEMAP_RBAC_FILE_PERMS == 0x00000001UL, "found 0x%.8xUL\n",
+               (unsigned)NODEMAP_RBAC_FILE_PERMS);
+       LASSERTF(NODEMAP_RBAC_DNE_OPS == 0x00000002UL, "found 0x%.8xUL\n",
+               (unsigned)NODEMAP_RBAC_DNE_OPS);
+       LASSERTF(NODEMAP_RBAC_QUOTA_OPS == 0x00000004UL, "found 0x%.8xUL\n",
+               (unsigned)NODEMAP_RBAC_QUOTA_OPS);
+       LASSERTF(NODEMAP_RBAC_BYFID_OPS == 0x00000008UL, "found 0x%.8xUL\n",
+               (unsigned)NODEMAP_RBAC_BYFID_OPS);
+       LASSERTF(NODEMAP_RBAC_CHLG_OPS == 0x00000010UL, "found 0x%.8xUL\n",
+               (unsigned)NODEMAP_RBAC_CHLG_OPS);
+       LASSERTF(NODEMAP_RBAC_FSCRYPT_ADMIN == 0x00000020UL, "found 0x%.8xUL\n",
+               (unsigned)NODEMAP_RBAC_FSCRYPT_ADMIN);
+       LASSERTF(NODEMAP_RBAC_NONE == 0xffffffc0UL, "found 0x%.8xUL\n",
+               (unsigned)NODEMAP_RBAC_NONE);
+       LASSERTF(NODEMAP_RBAC_ALL == 0xffffffffUL, "found 0x%.8xUL\n",
+               (unsigned)NODEMAP_RBAC_ALL);
 
        LASSERTF(OFD_ACCESS_READ == 0x00000001UL, "found 0x%.8xUL\n",
                (unsigned)OFD_ACCESS_READ);
@@ -6223,9 +6218,9 @@ void lustre_assert_wire_constants(void)
        LASSERTF(LCFG_NODEMAP_ADMIN == 0x000ce049UL, "found 0x%.8xUL\n",
                (unsigned)LCFG_NODEMAP_ADMIN);
        LASSERTF(LCFG_NODEMAP_ADD_PROJIDMAP == 0x000ce04aUL, "found 0x%.8xUL\n",
-                (unsigned)LCFG_NODEMAP_ADD_PROJIDMAP);
+               (unsigned)LCFG_NODEMAP_ADD_PROJIDMAP);
        LASSERTF(LCFG_NODEMAP_DEL_PROJIDMAP == 0x000ce04bUL, "found 0x%.8xUL\n",
-                (unsigned)LCFG_NODEMAP_DEL_PROJIDMAP);
+               (unsigned)LCFG_NODEMAP_DEL_PROJIDMAP);
        LASSERTF(LCFG_NODEMAP_TRUSTED == 0x000ce050UL, "found 0x%.8xUL\n",
                (unsigned)LCFG_NODEMAP_TRUSTED);
        LASSERTF(LCFG_NODEMAP_SQUASH_UID == 0x000ce051UL, "found 0x%.8xUL\n",
@@ -6251,13 +6246,13 @@ void lustre_assert_wire_constants(void)
        LASSERTF(LCFG_NODEMAP_SET_SEPOL == 0x000ce05bUL, "found 0x%.8xUL\n",
                (unsigned)LCFG_NODEMAP_SET_SEPOL);
        LASSERTF(LCFG_NODEMAP_FORBID_ENCRYPT == 0x000ce05cUL, "found 0x%.8xUL\n",
-                (unsigned)LCFG_NODEMAP_FORBID_ENCRYPT);
+               (unsigned)LCFG_NODEMAP_FORBID_ENCRYPT);
        LASSERTF(LCFG_NODEMAP_SQUASH_PROJID == 0x000ce05dUL, "found 0x%.8xUL\n",
-                (unsigned)LCFG_NODEMAP_SQUASH_PROJID);
+               (unsigned)LCFG_NODEMAP_SQUASH_PROJID);
        LASSERTF(LCFG_NODEMAP_READONLY_MOUNT == 0x000ce05eUL, "found 0x%.8xUL\n",
-                (unsigned)LCFG_NODEMAP_READONLY_MOUNT);
+               (unsigned)LCFG_NODEMAP_READONLY_MOUNT);
        LASSERTF(LCFG_NODEMAP_RBAC == 0x000ce05fUL, "found 0x%.8xUL\n",
-                (unsigned)LCFG_NODEMAP_RBAC);
+               (unsigned)LCFG_NODEMAP_RBAC);
 #endif /* HAVE_SERVER_SUPPORT */
        LASSERTF(PORTALS_CFG_TYPE == 1, "found %lld\n",
                 (long long)PORTALS_CFG_TYPE);