@@ -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) {
@@ -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);