Whamcloud - gitweb
LU-15584 utils: ppc64le __le64_to_cpu type mismatch 88/46588/2
authorGian-Carlo DeFazio <defazio1@llnl.gov>
Tue, 22 Feb 2022 20:23:30 +0000 (12:23 -0800)
committerOleg Drokin <green@whamcloud.com>
Sat, 5 Mar 2022 20:42:40 +0000 (20:42 +0000)
Cast values returned by __le64_to_cpu to
long long unsigned int. This is to match print format
strings that use %llx. This mismatch was resulting in a
build failure for ppc64le.

Build log message:
llog_reader.c:921:42: error: format '%llx' expects
argument of type 'long long unsigned int', but
argument 3 has type 'long unsigned int'

Fixes: 80447caf980 LU-14926 utils: print unlink and setattr recs in llog_reader
Signed-off-by: Gian-Carlo DeFazio <defazio1@llnl.gov>
Change-Id: I939b94626d2707b6ff644324c5c2798218331c4d
Reviewed-on: https://review.whamcloud.com/46588
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Olaf Faaland-LLNL <faaland1@llnl.gov>
Tested-by: Maloo <maloo@whamcloud.com>
lustre/utils/llog_reader.c

index b03d5df..1f574c0 100644 (file)
@@ -920,7 +920,7 @@ static void print_unlink_rec(struct llog_unlink_rec *lur)
 {
        printf("unlink record id:0x%x target %llx:%x:%x\n",
                __le32_to_cpu(lur->lur_hdr.lrh_id),
-               __le64_to_cpu(lur->lur_oid),
+               (unsigned long long)__le64_to_cpu(lur->lur_oid),
                __le32_to_cpu(lur->lur_oseq),
                __le32_to_cpu(lur->lur_count));
 }
@@ -937,7 +937,7 @@ static void print_setattr64_rec(struct llog_setattr64_rec *lsr)
        printf("setattr64 record id:0x%x target "DFID" valid %llx uid %u:%u gid %u:%u\n",
                __le32_to_cpu(lsr->lsr_hdr.lrh_id),
                PFID(&lsr->lsr_oi.oi_fid),
-               __le64_to_cpu(lsr->lsr_valid),
+               (unsigned long long)__le64_to_cpu(lsr->lsr_valid),
                __le32_to_cpu(lsr->lsr_uid_h),
                __le32_to_cpu(lsr->lsr_uid),
                __le32_to_cpu(lsr->lsr_gid_h),
@@ -949,7 +949,7 @@ static void print_setattr64_rec_v2(struct llog_setattr64_rec_v2 *lsr)
        printf("setattr64 v2 record id:0x%x target "DFID" valid %llx uid %u:%u gid %u:%u prj %u\n",
                __le32_to_cpu(lsr->lsr_hdr.lrh_id),
                PFID(&lsr->lsr_oi.oi_fid),
-               __le64_to_cpu(lsr->lsr_valid),
+               (unsigned long long)__le64_to_cpu(lsr->lsr_valid),
                __le32_to_cpu(lsr->lsr_uid_h),
                __le32_to_cpu(lsr->lsr_uid),
                __le32_to_cpu(lsr->lsr_gid_h),