LU-17947 build: fix LASSERTF [-Werror=format=] failure

This patch fixes the following build failures:

libcfs/include/libcfs/libcfs_private.h:89:34:
error: format '%o' expects argument of type 'unsigned int',
but argument 4 has type 'long unsigned int' [-Werror=format=]
   89 | "ASSERTION( %s ) failed: " fmt, #cond, \
      | ^~~~~~~~~~~~~~~~~~~~~~~~~~
lustre/ptlrpc/wiretest.c:2718:9: note: in expansion of macro 'LASSERTF'
 2718 | LASSERTF(MDS_FMODE_CLOSED == 000000000000UL, "found 0%.11oUL\n",
      | ^~~~~~~~

Test-Parameters: trivial
Signed-off-by: Jian Yu <yujian@whamcloud.com>
Change-Id: I97a895e6234721c34f681d0ee7ce91ead4dd30f8
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/55415
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Arshad Hussain <arshad.hussain@aeoncomputing.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre/ptlrpc/wiretest.c b/lustre/ptlrpc/wiretest.c
index 91a3861..8f76dc8 100644 (file)
--- a/lustre/ptlrpc/wiretest.c
+++ b/lustre/ptlrpc/wiretest.c
@@ -2717,50 +2717,50 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct mdt_body, mbo_padding_10));
        LASSERTF((int)sizeof(((struct mdt_body *)0)->mbo_padding_10) == 8, "found %lld\n",
                 (long long)(int)sizeof(((struct mdt_body *)0)->mbo_padding_10));
-       LASSERTF(MDS_FMODE_CLOSED == 000000000000UL, "found 0%.11oUL\n",
-               MDS_FMODE_CLOSED);
-       LASSERTF(MDS_FMODE_EXEC == 000000000004UL, "found 0%.11oUL\n",
-               MDS_FMODE_EXEC);
-       LASSERTF(MDS_OPEN_CREATED == 000000000010UL, "found 0%.11oUL\n",
-               MDS_OPEN_CREATED);
-       LASSERTF(MDS_OPEN_CREAT == 000000000100UL, "found 0%.11oUL\n",
-               MDS_OPEN_CREAT);
-       LASSERTF(MDS_OPEN_EXCL == 000000000200UL, "found 0%.11oUL\n",
-               MDS_OPEN_EXCL);
-       LASSERTF(MDS_OPEN_TRUNC == 000000001000UL, "found 0%.11oUL\n",
-               MDS_OPEN_TRUNC);
-       LASSERTF(MDS_OPEN_APPEND == 000000002000UL, "found 0%.11oUL\n",
-               MDS_OPEN_APPEND);
-       LASSERTF(MDS_OPEN_SYNC == 000000010000UL, "found 0%.11oUL\n",
-               MDS_OPEN_SYNC);
-       LASSERTF(MDS_OPEN_DIRECTORY == 000000200000UL, "found 0%.11oUL\n",
-               MDS_OPEN_DIRECTORY);
-       LASSERTF(MDS_OPEN_BY_FID == 000040000000UL, "found 0%.11oUL\n",
-               MDS_OPEN_BY_FID);
-       LASSERTF(MDS_OPEN_DELAY_CREATE == 000100000000UL, "found 0%.11oUL\n",
-               MDS_OPEN_DELAY_CREATE);
-       LASSERTF(MDS_OPEN_OWNEROVERRIDE == 000200000000UL, "found 0%.11oUL\n",
-               MDS_OPEN_OWNEROVERRIDE);
-       LASSERTF(MDS_OPEN_LOCK == 004000000000UL, "found 0%.11oUL\n",
-               MDS_OPEN_LOCK);
-       LASSERTF(MDS_OPEN_HAS_EA == 010000000000UL, "found 0%.11oUL\n",
-               MDS_OPEN_HAS_EA);
+       LASSERTF(MDS_FMODE_CLOSED == 0000000000000000000000000UL,
+                "found 0%.22lloUL\n", (long long)MDS_FMODE_CLOSED);
+       LASSERTF(MDS_FMODE_EXEC == 0000000000000000000000004UL,
+                "found 0%.22lloUL\n", (long long)MDS_FMODE_EXEC);
+       LASSERTF(MDS_OPEN_CREATED == 0000000000000000000000010UL,
+                "found 0%.22lloUL\n", (long long)MDS_OPEN_CREATED);
+       LASSERTF(MDS_OPEN_CREAT == 0000000000000000000000100UL,
+                "found 0%.22lloUL\n", (long long)MDS_OPEN_CREAT);
+       LASSERTF(MDS_OPEN_EXCL == 0000000000000000000000200UL,
+                "found 0%.22lloUL\n", (long long)MDS_OPEN_EXCL);
+       LASSERTF(MDS_OPEN_TRUNC == 0000000000000000000001000UL,
+                "found 0%.22lloUL\n", (long long)MDS_OPEN_TRUNC);
+       LASSERTF(MDS_OPEN_APPEND == 0000000000000000000002000UL,
+                "found 0%.22lloUL\n", (long long)MDS_OPEN_APPEND);
+       LASSERTF(MDS_OPEN_SYNC == 0000000000000000000010000UL,
+                "found 0%.22lloUL\n", (long long)MDS_OPEN_SYNC);
+       LASSERTF(MDS_OPEN_DIRECTORY == 0000000000000000000200000UL,
+                "found 0%.22lloUL\n", (long long)MDS_OPEN_DIRECTORY);
+       LASSERTF(MDS_OPEN_BY_FID == 0000000000000000040000000UL,
+                "found 0%.22lloUL\n", (long long)MDS_OPEN_BY_FID);
+       LASSERTF(MDS_OPEN_DELAY_CREATE == 0000000000000000100000000UL,
+                "found 0%.22lloUL\n", (long long)MDS_OPEN_DELAY_CREATE);
+       LASSERTF(MDS_OPEN_OWNEROVERRIDE == 0000000000000000200000000UL,
+                "found 0%.22lloUL\n", (long long)MDS_OPEN_OWNEROVERRIDE);
+       LASSERTF(MDS_OPEN_LOCK == 0000000000000004000000000UL,
+                "found 0%.22lloUL\n", (long long)MDS_OPEN_LOCK);
+       LASSERTF(MDS_OPEN_HAS_EA == 0000000000000010000000000UL,
+                "found 0%.22lloUL\n", (long long)MDS_OPEN_HAS_EA);
        LASSERTF(MDS_OPEN_HAS_OBJS == 0000000000000020000000000UL,
                 "found 0%.22lloUL\n", (long long)MDS_OPEN_HAS_OBJS);
-       LASSERTF(MDS_OPEN_NORESTORE == 00000000000100000000000ULL, "found 0%.22lloULL\n",
-                       (long long)MDS_OPEN_NORESTORE);
-       LASSERTF(MDS_OPEN_NEWSTRIPE == 00000000000200000000000ULL, "found 0%.22lloULL\n",
-                       (long long)MDS_OPEN_NEWSTRIPE);
-       LASSERTF(MDS_OPEN_VOLATILE == 00000000000400000000000ULL, "found 0%.22lloULL\n",
-                       (long long)MDS_OPEN_VOLATILE);
-       LASSERTF(MDS_OPEN_LEASE == 00000000001000000000000ULL, "found 0%.22lloULL\n",
-                       (long long)MDS_OPEN_LEASE);
-       LASSERTF(MDS_OPEN_RESYNC == 00000000004000000000000ULL, "found 0%.22lloULL\n",
-                       (long long)MDS_OPEN_RESYNC);
-       LASSERTF(MDS_OPEN_PCC == 00000000010000000000000ULL, "found 0%.22lloULL\n",
-                       (long long)MDS_OPEN_PCC);
-       LASSERTF(MDS_OPEN_DEFAULT_LMV == 00000000040000000000000ULL, "found 0%.22lloULL\n",
-                       (long long)MDS_OPEN_DEFAULT_LMV);
+       LASSERTF(MDS_OPEN_NORESTORE == 00000000000100000000000ULL,
+                "found 0%.22lloULL\n", (long long)MDS_OPEN_NORESTORE);
+       LASSERTF(MDS_OPEN_NEWSTRIPE == 00000000000200000000000ULL,
+                "found 0%.22lloULL\n", (long long)MDS_OPEN_NEWSTRIPE);
+       LASSERTF(MDS_OPEN_VOLATILE == 00000000000400000000000ULL,
+                "found 0%.22lloULL\n", (long long)MDS_OPEN_VOLATILE);
+       LASSERTF(MDS_OPEN_LEASE == 00000000001000000000000ULL,
+                "found 0%.22lloULL\n", (long long)MDS_OPEN_LEASE);
+       LASSERTF(MDS_OPEN_RESYNC == 00000000004000000000000ULL,
+                "found 0%.22lloULL\n", (long long)MDS_OPEN_RESYNC);
+       LASSERTF(MDS_OPEN_PCC == 00000000010000000000000ULL,
+                "found 0%.22lloULL\n", (long long)MDS_OPEN_PCC);
+       LASSERTF(MDS_OPEN_DEFAULT_LMV == 00000000040000000000000ULL,
+                "found 0%.22lloULL\n", (long long)MDS_OPEN_DEFAULT_LMV);
        LASSERTF(LUSTRE_SYNC_FL == 0x00000008UL, "found 0x%.8xUL\n",
                (unsigned)LUSTRE_SYNC_FL);
        LASSERTF(LUSTRE_IMMUTABLE_FL == 0x00000010UL, "found 0x%.8xUL\n",

diff --git a/lustre/utils/wirecheck.c b/lustre/utils/wirecheck.c
index 1529b80..09729de 100644 (file)
--- a/lustre/utils/wirecheck.c
+++ b/lustre/utils/wirecheck.c
@@ -1276,21 +1276,21 @@ check_mdt_body(void)
        CHECK_MEMBER(mdt_body, mbo_padding_9);
        CHECK_MEMBER(mdt_body, mbo_padding_10);
 
-       CHECK_VALUE_O(MDS_FMODE_CLOSED);
-       CHECK_VALUE_O(MDS_FMODE_EXEC);
-
-       CHECK_VALUE_O(MDS_OPEN_CREATED);
-       CHECK_VALUE_O(MDS_OPEN_CREAT);
-       CHECK_VALUE_O(MDS_OPEN_EXCL);
-       CHECK_VALUE_O(MDS_OPEN_TRUNC);
-       CHECK_VALUE_O(MDS_OPEN_APPEND);
-       CHECK_VALUE_O(MDS_OPEN_SYNC);
-       CHECK_VALUE_O(MDS_OPEN_DIRECTORY);
-       CHECK_VALUE_O(MDS_OPEN_BY_FID);
-       CHECK_VALUE_O(MDS_OPEN_DELAY_CREATE);
-       CHECK_VALUE_O(MDS_OPEN_OWNEROVERRIDE);
-       CHECK_VALUE_O(MDS_OPEN_LOCK);
-       CHECK_VALUE_O(MDS_OPEN_HAS_EA);
+       CHECK_VALUE_64O(MDS_FMODE_CLOSED);
+       CHECK_VALUE_64O(MDS_FMODE_EXEC);
+
+       CHECK_VALUE_64O(MDS_OPEN_CREATED);
+       CHECK_VALUE_64O(MDS_OPEN_CREAT);
+       CHECK_VALUE_64O(MDS_OPEN_EXCL);
+       CHECK_VALUE_64O(MDS_OPEN_TRUNC);
+       CHECK_VALUE_64O(MDS_OPEN_APPEND);
+       CHECK_VALUE_64O(MDS_OPEN_SYNC);
+       CHECK_VALUE_64O(MDS_OPEN_DIRECTORY);
+       CHECK_VALUE_64O(MDS_OPEN_BY_FID);
+       CHECK_VALUE_64O(MDS_OPEN_DELAY_CREATE);
+       CHECK_VALUE_64O(MDS_OPEN_OWNEROVERRIDE);
+       CHECK_VALUE_64O(MDS_OPEN_LOCK);
+       CHECK_VALUE_64O(MDS_OPEN_HAS_EA);
        CHECK_VALUE_64O(MDS_OPEN_HAS_OBJS);
        CHECK_VALUE_64O(MDS_OPEN_NORESTORE);
        CHECK_VALUE_64O(MDS_OPEN_NEWSTRIPE);

diff --git a/lustre/utils/wiretest.c b/lustre/utils/wiretest.c
index e4e5427..8b2660e 100644 (file)
--- a/lustre/utils/wiretest.c
+++ b/lustre/utils/wiretest.c
@@ -2742,34 +2742,34 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct mdt_body, mbo_padding_10));
        LASSERTF((int)sizeof(((struct mdt_body *)0)->mbo_padding_10) == 8, "found %lld\n",
                 (long long)(int)sizeof(((struct mdt_body *)0)->mbo_padding_10));
-       LASSERTF(MDS_FMODE_CLOSED == 000000000000UL, "found 0%.11oUL\n",
-               MDS_FMODE_CLOSED);
-       LASSERTF(MDS_FMODE_EXEC == 000000000004UL, "found 0%.11oUL\n",
-               MDS_FMODE_EXEC);
-       LASSERTF(MDS_OPEN_CREATED == 000000000010UL, "found 0%.11oUL\n",
-               MDS_OPEN_CREATED);
-       LASSERTF(MDS_OPEN_CREAT == 000000000100UL, "found 0%.11oUL\n",
-               MDS_OPEN_CREAT);
-       LASSERTF(MDS_OPEN_EXCL == 000000000200UL, "found 0%.11oUL\n",
-               MDS_OPEN_EXCL);
-       LASSERTF(MDS_OPEN_TRUNC == 000000001000UL, "found 0%.11oUL\n",
-               MDS_OPEN_TRUNC);
-       LASSERTF(MDS_OPEN_APPEND == 000000002000UL, "found 0%.11oUL\n",
-               MDS_OPEN_APPEND);
-       LASSERTF(MDS_OPEN_SYNC == 000000010000UL, "found 0%.11oUL\n",
-               MDS_OPEN_SYNC);
-       LASSERTF(MDS_OPEN_DIRECTORY == 000000200000UL, "found 0%.11oUL\n",
-               MDS_OPEN_DIRECTORY);
-       LASSERTF(MDS_OPEN_BY_FID == 000040000000UL, "found 0%.11oUL\n",
-               MDS_OPEN_BY_FID);
-       LASSERTF(MDS_OPEN_DELAY_CREATE == 000100000000UL, "found 0%.11oUL\n",
-               MDS_OPEN_DELAY_CREATE);
-       LASSERTF(MDS_OPEN_OWNEROVERRIDE == 000200000000UL, "found 0%.11oUL\n",
-               MDS_OPEN_OWNEROVERRIDE);
-       LASSERTF(MDS_OPEN_LOCK == 004000000000UL, "found 0%.11oUL\n",
-               MDS_OPEN_LOCK);
-       LASSERTF(MDS_OPEN_HAS_EA == 010000000000UL, "found 0%.11oUL\n",
-               MDS_OPEN_HAS_EA);
+       LASSERTF(MDS_FMODE_CLOSED  == 0000000000000000000000000UL,
+                "found 0%.22lloUL\n", (long long)MDS_FMODE_CLOSED);
+       LASSERTF(MDS_FMODE_EXEC == 0000000000000000000000004UL,
+                "found 0%.22lloUL\n", (long long)MDS_FMODE_EXEC);
+       LASSERTF(MDS_OPEN_CREATED == 0000000000000000000000010UL,
+                "found 0%.22lloUL\n", (long long)MDS_OPEN_CREATED);
+       LASSERTF(MDS_OPEN_CREAT == 0000000000000000000000100UL,
+                "found 0%.22lloUL\n", (long long)MDS_OPEN_CREAT);
+       LASSERTF(MDS_OPEN_EXCL == 0000000000000000000000200UL,
+                "found 0%.22lloUL\n", (long long)MDS_OPEN_EXCL);
+       LASSERTF(MDS_OPEN_TRUNC == 0000000000000000000001000UL,
+                "found 0%.22lloUL\n", (long long)MDS_OPEN_TRUNC);
+       LASSERTF(MDS_OPEN_APPEND == 0000000000000000000002000UL,
+                "found 0%.22lloUL\n", (long long)MDS_OPEN_APPEND);
+       LASSERTF(MDS_OPEN_SYNC == 0000000000000000000010000UL,
+                "found 0%.22lloUL\n", (long long)MDS_OPEN_SYNC);
+       LASSERTF(MDS_OPEN_DIRECTORY == 0000000000000000000200000UL,
+                "found 0%.22lloUL\n", (long long)MDS_OPEN_DIRECTORY);
+       LASSERTF(MDS_OPEN_BY_FID == 0000000000000000040000000UL,
+                "found 0%.22lloUL\n", (long long)MDS_OPEN_BY_FID);
+       LASSERTF(MDS_OPEN_DELAY_CREATE == 0000000000000000100000000UL,
+                "found 0%.22lloUL\n", (long long)MDS_OPEN_DELAY_CREATE);
+       LASSERTF(MDS_OPEN_OWNEROVERRIDE == 0000000000000000200000000UL,
+                "found 0%.22lloUL\n", (long long)MDS_OPEN_OWNEROVERRIDE);
+       LASSERTF(MDS_OPEN_LOCK == 0000000000000004000000000UL,
+                "found 0%.22lloUL\n", (long long)MDS_OPEN_LOCK);
+       LASSERTF(MDS_OPEN_HAS_EA == 0000000000000010000000000UL,
+                "found 0%.22lloUL\n", (long long)MDS_OPEN_HAS_EA);
        LASSERTF(MDS_OPEN_HAS_OBJS == 0000000000000020000000000UL,
                 "found 0%.22lloUL\n", (long long)MDS_OPEN_HAS_OBJS);
        LASSERTF(MDS_OPEN_NORESTORE == 00000000000100000000000ULL, "found 0%.22lloULL\n",