From: "Darrick J. Wong" <djwong@kernel.org>
To: sandeen@sandeen.net
Cc: linux-xfs@vger.kernel.org
Subject: [PATCH 3/1] xfs_repair: fix printf format specifiers on 32-bit platforms
Date: Thu, 4 Aug 2022 19:40:16 -0700 [thread overview]
Message-ID: <YuyDEDALtN4f6J4/@magnolia> (raw)
In-Reply-To: <165826708900.3268805.5228849676662461141.stgit@magnolia>
From: Darrick J. Wong <djwong@kernel.org>
armv7l builds spit out the following warnings:
In file included from ../include/platform_defs.h:44,
from ../include/libxfs.h:13,
from bmap.c:7:
bmap.c: In function ‘blkmap_alloc’:
bmap.c:41:11: error: format ‘%d’ expects argument of type ‘int’, but argument 2 has type ‘xfs_extnum_t’ {aka ‘long long unsigned int’} [-Werror=format=]
41 | _("Number of extents requested in blkmap_alloc (%d) overflows 32 bits.\n"
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
bmap.c:41:9: note: in expansion of macro ‘_’
41 | _("Number of extents requested in blkmap_alloc (%d) overflows 32 bits.\n"
| ^
bmap.c:41:58: note: format string is defined here
41 | _("Number of extents requested in blkmap_alloc (%d) overflows 32 bits.\n"
| ~^
| |
| int
| %lld
In file included from ../include/platform_defs.h:44,
from ../include/libxfs.h:13,
from bmap.c:7:
bmap.c:54:35: error: format ‘%zu’ expects argument of type ‘size_t’, but argument 2 has type ‘xfs_extnum_t’ {aka ‘long long unsigned int’} [-Werror=format=]
54 | do_warn(_("malloc failed in blkmap_alloc (%zu bytes)\n"),
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
bmap.c:54:33: note: in expansion of macro ‘_’
54 | do_warn(_("malloc failed in blkmap_alloc (%zu bytes)\n"),
| ^
bmap.c:54:69: note: format string is defined here
54 | do_warn(_("malloc failed in blkmap_alloc (%zu bytes)\n"),
| ~~^
| |
| unsigned int
| %llu
Fix these.
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
logprint/log_misc.c | 8 ++++----
repair/bmap.c | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/logprint/log_misc.c b/logprint/log_misc.c
index 82e1f682..836156e0 100644
--- a/logprint/log_misc.c
+++ b/logprint/log_misc.c
@@ -493,16 +493,16 @@ xlog_print_trans_inode_core(
nextents = ip->di_big_nextents;
else
nextents = ip->di_nextents;
- printf(_("size 0x%llx nblocks 0x%llx extsize 0x%x nextents 0x%lx\n"),
+ printf(_("size 0x%llx nblocks 0x%llx extsize 0x%x nextents 0x%llx\n"),
(unsigned long long)ip->di_size, (unsigned long long)ip->di_nblocks,
- ip->di_extsize, nextents);
+ ip->di_extsize, (unsigned long long)nextents);
if (ip->di_flags2 & XFS_DIFLAG2_NREXT64)
nextents = ip->di_big_anextents;
else
nextents = ip->di_anextents;
- printf(_("naextents 0x%lx forkoff %d dmevmask 0x%x dmstate 0x%hx\n"),
- nextents, (int)ip->di_forkoff, ip->di_dmevmask, ip->di_dmstate);
+ printf(_("naextents 0x%llx forkoff %d dmevmask 0x%x dmstate 0x%hx\n"),
+ (unsigned long long)nextents, (int)ip->di_forkoff, ip->di_dmevmask, ip->di_dmstate);
printf(_("flags 0x%x gen 0x%x\n"),
ip->di_flags, ip->di_gen);
if (ip->di_version == 3) {
diff --git a/repair/bmap.c b/repair/bmap.c
index 44e43ab4..cd1a8b07 100644
--- a/repair/bmap.c
+++ b/repair/bmap.c
@@ -38,10 +38,10 @@ blkmap_alloc(
#if (BITS_PER_LONG == 32) /* on 64-bit platforms this is never true */
if (nex > BLKMAP_NEXTS_MAX) {
do_warn(
- _("Number of extents requested in blkmap_alloc (%d) overflows 32 bits.\n"
+ _("Number of extents requested in blkmap_alloc (%llu) overflows 32 bits.\n"
"If this is not a corruption, then you will need a 64 bit system\n"
"to repair this filesystem.\n"),
- nex);
+ (unsigned long long)nex);
return NULL;
}
#endif
@@ -51,8 +51,8 @@ blkmap_alloc(
if (!blkmap || blkmap->naexts < nex) {
blkmap = realloc(blkmap, BLKMAP_SIZE(nex));
if (!blkmap) {
- do_warn(_("malloc failed in blkmap_alloc (%zu bytes)\n"),
- BLKMAP_SIZE(nex));
+ do_warn(_("malloc failed in blkmap_alloc (%llu bytes)\n"),
+ (unsigned long long)BLKMAP_SIZE(nex));
return NULL;
}
pthread_setspecific(key, blkmap);
next prev parent reply other threads:[~2022-08-05 2:40 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-19 21:44 [PATCHSET v2 0/1] xfsprogs: random fixes for 5.19 Darrick J. Wong
2022-07-19 21:44 ` [PATCH 1/1] mkfs: complain about impossible log size constraints Darrick J. Wong
2022-08-05 2:23 ` Eric Sandeen
2022-07-21 16:41 ` [PATCH 2/1] libxfs: stop overriding MAP_SYNC in publicly exported header files Darrick J. Wong
2022-08-05 2:40 ` Darrick J. Wong [this message]
2022-08-05 2:41 ` [PATCH 4/1] xfs_repair: retain superblock buffer to avoid write hook deadlock Darrick J. Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YuyDEDALtN4f6J4/@magnolia \
--to=djwong@kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=sandeen@sandeen.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.