In the past, when mkfs was first written, it used atoi and
similar calls, so the variables were ints. However, the situation moved
since then and in course of the time, mkfs began to use other types too.
Clean and unify it. We don't need negative values anywhere in the code and
some numbers has to be 64bit. Thus, uint64_t is the best candidate as the target
type for numeric values. The existing uses of __uint64_t in mkfs change to the
standard uint64_t type. For flag values let's use boolean.
This patch changes variables declared at the beginning of main() +
block/sectorsize, making only minimal changes. The following patch
cleans some now-unnecessary type casts.
It would be nice to change types in some of the structures too, but
this might lead to changes outside of mkfs, so I'm skipping them for
this moment to keep it simple.
Signed-off-by: Jan Tulak <jtulak@xxxxxxxxxx>
---
CHANGES:
* __uint64_t -> uint64_t (now also in multidisk.h)
* Add other places, where we still used long long and I forgot them
before (cvtnum, getnum, subopt_param)
Previous changes
* Flags as bool
* %lu as PRIu64
Signed-off-by: Jan Tulak <jtulak@xxxxxxxxxx>
---
include/xfs_multidisk.h | 2 +-
mkfs/xfs_mkfs.c | 266 ++++++++++++++++++++++++------------------------
2 files changed, 134 insertions(+), 134 deletions(-)
diff --git a/include/xfs_multidisk.h b/include/xfs_multidisk.h
index ce9bbce..de4924f 100644
--- a/include/xfs_multidisk.h
+++ b/include/xfs_multidisk.h
@@ -57,7 +57,7 @@
#define XFS_NOMULTIDISK_AGLOG 2 /* 4 AGs */
#define XFS_MULTIDISK_AGCOUNT (1 << XFS_MULTIDISK_AGLOG)
-extern long long cvtnum(unsigned int blksize, unsigned int sectsize,
+extern uint64_t cvtnum(unsigned int blksize, unsigned int sectsize,
const char *str);
/* proto.c */
diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index 7a5c49f..40a32be 100644
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -39,8 +39,8 @@ static int ispow2(unsigned int i);
* The configured block and sector sizes are defined as global variables so
* that they don't need to be passed to functions that require them.
*/
-unsigned int blocksize;
-unsigned int sectorsize;
+uint64_t blocksize;
+uint64_t sectorsize;
#define MAX_SUBOPTS 16
#define SUBOPT_NEEDS_VAL (-1LL)
@@ -138,9 +138,9 @@ struct opt_params {
bool convert;
bool is_power_2;
int conflicts[MAX_CONFLICTS];
- long long minval;
- long long maxval;
- long long defaultval;
+ uint64_t minval;
+ uint64_t maxval;
+ uint64_t defaultval;
} subopt_params[MAX_SUBOPTS];
};
@@ -724,9 +724,9 @@ struct opt_params mopts = {
},
};
-#define TERABYTES(count, blog) ((__uint64_t)(count) << (40 - (blog)))
-#define GIGABYTES(count, blog) ((__uint64_t)(count) << (30 - (blog)))
-#define MEGABYTES(count, blog) ((__uint64_t)(count) << (20 - (blog)))
+#define TERABYTES(count, blog) ((uint64_t)(count) << (40 - (blog)))
+#define GIGABYTES(count, blog) ((uint64_t)(count) << (30 - (blog)))
+#define MEGABYTES(count, blog) ((uint64_t)(count) << (20 - (blog)))
/*
* Use this macro before we have superblock and mount structure
@@ -758,9 +758,9 @@ calc_stripe_factors(
int dsectsz,
int lsu,
int lsectsz,
- int *dsunit,
- int *dswidth,
- int *lsunit)
+ uint64_t *dsunit,
+ uint64_t *dswidth,
+ uint64_t *lsunit)
{
/* Handle data sunit/swidth options */
if ((*dsunit && !*dswidth) || (!*dsunit && *dswidth)) {
@@ -785,32 +785,32 @@ calc_stripe_factors(
usage();
}
- *dsunit = (int)BTOBBT(dsu);
+ *dsunit = BTOBBT(dsu);
*dswidth = *dsunit * dsw;
}
if (*dsunit && (*dswidth % *dsunit != 0)) {
fprintf(stderr,
- _("data stripe width (%d) must be a multiple of the "
- "data stripe unit (%d)\n"), *dswidth, *dsunit);
+ _("data stripe width (%"PRIu64") must be a multiple of the "
+ "data stripe unit (%"PRIu64")\n"), *dswidth, *dsunit);
usage();
}
/* Handle log sunit options */
if (lsu)
- *lsunit = (int)BTOBBT(lsu);
+ *lsunit = BTOBBT(lsu);
/* verify if lsu/lsunit is a multiple block size */
if (lsu % blocksize != 0) {
fprintf(stderr,
-_("log stripe unit (%d) must be a multiple of the block size (%d)\n"),
+_("log stripe unit (%d) must be a multiple of the block size (%"PRIu64")\n"),
lsu, blocksize);
exit(1);
}
if ((BBTOB(*lsunit) % blocksize != 0)) {
fprintf(stderr,
-_("log stripe unit (%d) must be a multiple of the block size (%d)\n"),
+_("log stripe unit (%"PRIu64") must be a multiple of the block size (%"PRIu64")\n"),
BBTOB(*lsunit), blocksize);
exit(1);
}
@@ -897,7 +897,7 @@ fixup_log_stripe_unit(
xfs_rfsblock_t *logblocks,
int blocklog)
{
- __uint64_t tmp_logblocks;
+ uint64_t tmp_logblocks;
/*
* Make sure that the log size is a multiple of the stripe unit
@@ -929,11 +929,11 @@ fixup_internal_log_stripe(
xfs_mount_t *mp,
int lsflag,
xfs_fsblock_t logstart,
- __uint64_t agsize,
+ uint64_t agsize,
int sunit,
xfs_rfsblock_t *logblocks,
int blocklog,
- int *lalign)
+ uint64_t *lalign)
{
if ((logstart % sunit) != 0) {
logstart = ((logstart + (sunit - 1))/sunit) * sunit;
@@ -953,7 +953,7 @@ fixup_internal_log_stripe(
}
void
-validate_log_size(__uint64_t logblocks, int blocklog, int min_logblocks)
+validate_log_size(uint64_t logblocks, int blocklog, int min_logblocks)
{
if (logblocks < min_logblocks) {
fprintf(stderr,
@@ -978,7 +978,7 @@ validate_log_size(__uint64_t logblocks, int blocklog, int min_logblocks)
static int
calc_default_imaxpct(
int blocklog,
- __uint64_t dblocks)
+ uint64_t dblocks)
{
/*
* This returns the % of the disk space that is used for
@@ -1000,9 +1000,9 @@ calc_default_imaxpct(
static void
validate_ag_geometry(
int blocklog,
- __uint64_t dblocks,
- __uint64_t agsize,
- __uint64_t agcount)
+ uint64_t dblocks,
+ uint64_t agsize,
+ uint64_t agcount)
{
if (agsize < XFS_AG_MIN_BLOCKS(blocklog)) {
fprintf(stderr,
@@ -1131,8 +1131,8 @@ zero_old_xfs_structures(
i != sb.sb_blocklog)
goto done;
- if (sb.sb_dblocks > ((__uint64_t)sb.sb_agcount * sb.sb_agblocks) ||
- sb.sb_dblocks < ((__uint64_t)(sb.sb_agcount - 1) *
+ if (sb.sb_dblocks > ((uint64_t)sb.sb_agcount * sb.sb_agblocks) ||
+ sb.sb_dblocks < ((uint64_t)(sb.sb_agcount - 1) *
sb.sb_agblocks + XFS_MIN_AG_BLOCKS))
goto done;
@@ -1152,7 +1152,7 @@ done:
}
static void
-discard_blocks(dev_t dev, __uint64_t nsectors)
+discard_blocks(dev_t dev, uint64_t nsectors)
{
int fd;
@@ -1336,14 +1336,14 @@ check_opt(
}
}
-static long long
+static uint64_t
getnum(
const char *str,
struct opt_params *opts,
int index)
{
struct subopt_param *sp = &opts->subopt_params[index];
- long long c;
+ uint64_t c;
check_opt(opts, index, false);
/* empty strings might just return a default value */
@@ -1414,77 +1414,77 @@ main(
int argc,
char **argv)
{
- __uint64_t agcount;
+ uint64_t agcount;
xfs_agf_t *agf;
xfs_agi_t *agi;
xfs_agnumber_t agno;
- __uint64_t agsize;
+ uint64_t agsize;
xfs_alloc_rec_t *arec;
struct xfs_btree_block *block;
- int blflag;
- int blocklog;
- int bsflag;
- int bsize;
+ bool blflag;
+ uint64_t blocklog;
+ bool bsflag;
+ uint64_t bsize;
xfs_buf_t *buf;
- int c;
- int daflag;
- int dasize;
+ uint64_t c;
+ bool daflag;
+ uint64_t dasize;
xfs_rfsblock_t dblocks;
char *dfile;
- int dirblocklog;
- int dirblocksize;
+ uint64_t dirblocklog;
+ uint64_t dirblocksize;
char *dsize;
- int dsu;
- int dsw;
- int dsunit;
- int dswidth;
- int force_overwrite;
+ uint64_t dsu;
+ uint64_t dsw;
+ uint64_t dsunit;
+ uint64_t dswidth;
+ bool force_overwrite;
struct fsxattr fsx;
- int ilflag;
- int imaxpct;
- int imflag;
- int inodelog;
- int inopblock;
- int ipflag;
- int isflag;
- int isize;
+ bool ilflag;
+ uint64_t imaxpct;
+ bool imflag;
+ uint64_t inodelog;
+ uint64_t inopblock;
+ bool ipflag;
+ bool isflag;
+ uint64_t isize;
char *label = NULL;
- int laflag;
- int lalign;
- int ldflag;
- int liflag;
+ bool laflag;
+ uint64_t lalign;
+ bool ldflag;
+ bool liflag;
xfs_agnumber_t logagno;
xfs_rfsblock_t logblocks;
char *logfile;
- int loginternal;
+ uint64_t loginternal;
char *logsize;
xfs_fsblock_t logstart;
- int lvflag;
- int lsflag;
- int lsuflag;
- int lsunitflag;
- int lsectorlog;
- int lsectorsize;
- int lslflag;
- int lssflag;
- int lsu;
- int lsunit;
- int min_logblocks;
+ bool lvflag;
+ bool lsflag;
+ bool lsuflag;
+ bool lsunitflag;
+ uint64_t lsectorlog;
+ uint64_t lsectorsize;
+ bool lslflag;
+ bool lssflag;
+ uint64_t lsu;
+ uint64_t lsunit;
+ uint64_t min_logblocks;
xfs_mount_t *mp;
xfs_mount_t mbuf;
xfs_extlen_t nbmblocks;
- int nlflag;
- int nodsflag;
- int norsflag;
+ bool nlflag;
+ bool nodsflag;
+ bool norsflag;
xfs_alloc_rec_t *nrec;
- int nsflag;
- int nvflag;
- int Nflag;
- int discard = 1;
+ bool nsflag;
+ bool nvflag;
+ bool Nflag;
+ uint64_t discard = 1;
char *p;
char *protofile;
char *protostring;
- int qflag;
+ bool qflag;
xfs_rfsblock_t rtblocks;
xfs_extlen_t rtextblocks;
xfs_rtblock_t rtextents;
@@ -1492,13 +1492,13 @@ main(
char *rtfile;
char *rtsize;
xfs_sb_t *sbp;
- int sectorlog;
- __uint64_t sector_mask;
- int slflag;
- int ssflag;
- __uint64_t tmp_agsize;
+ uint64_t sectorlog;
+ uint64_t sector_mask;
+ bool slflag;
+ bool ssflag;
+ uint64_t tmp_agsize;
uuid_t uuid;
- int worst_freelist;
+ uint64_t worst_freelist;
libxfs_init_t xi;
struct fs_topology ft;
struct sb_feat_args sb_feat = {
@@ -1528,20 +1528,20 @@ main(
blocklog = blocksize = 0;
sectorlog = lsectorlog = 0;
sectorsize = lsectorsize = 0;
- agsize = daflag = dasize = dblocks = 0;
- ilflag = imflag = ipflag = isflag = 0;
- liflag = laflag = lsflag = lsuflag = lsunitflag = ldflag = lvflag = 0;
+ agsize = dasize = dblocks = 0;
+ daflag = ilflag = imflag = ipflag = isflag = false;
+ liflag = laflag = lsflag = lsuflag = lsunitflag = ldflag = lvflag = false;
loginternal = 1;
logagno = logblocks = rtblocks = rtextblocks = 0;
- Nflag = nlflag = nsflag = nvflag = 0;
+ Nflag = nlflag = nsflag = nvflag = false;
dirblocklog = dirblocksize = 0;
- qflag = 0;
+ qflag = false;
imaxpct = inodelog = inopblock = isize = 0;
dfile = logfile = rtfile = NULL;
dsize = logsize = rtsize = rtextsize = protofile = NULL;
dsu = dsw = dsunit = dswidth = lalign = lsu = lsunit = 0;
- nodsflag = norsflag = 0;
- force_overwrite = 0;
+ nodsflag = norsflag = false;
+ force_overwrite = false;
worst_freelist = 0;
memset(&fsx, 0, sizeof(fsx));
@@ -1553,7 +1553,7 @@ main(
switch (c) {
case 'C':
case 'f':
- force_overwrite = 1;
+ force_overwrite = true;
break;
case 'b':
p = optarg;
@@ -1962,7 +1962,7 @@ main(
blocksize = 1 << XFS_DFL_BLOCKSIZE_LOG;
}
if (blocksize < XFS_MIN_BLOCKSIZE || blocksize > XFS_MAX_BLOCKSIZE) {
- fprintf(stderr, _("illegal block size %d\n"), blocksize);
+ fprintf(stderr, _("illegal block size %"PRIu64"\n"), blocksize);
usage();
}
if (sb_feat.crcs_enabled && blocksize < XFS_MIN_CRC_BLOCKSIZE) {
@@ -2026,7 +2026,7 @@ _("Minimum block size for CRC enabled filesystems is %d bytes.\n"),
if ((blocksize < sectorsize) && (blocksize >= ft.lsectorsize)) {
fprintf(stderr,
-_("specified blocksize %d is less than device physical sector size %d\n"),
+_("specified blocksize %"PRIu64" is less than device physical sector size %d\n"),
blocksize, ft.psectorsize);
fprintf(stderr,
_("switching to logical sector size %d\n"),
@@ -2047,21 +2047,21 @@ _("switching to logical sector size %d\n"),
if (sectorsize < XFS_MIN_SECTORSIZE ||
sectorsize > XFS_MAX_SECTORSIZE || sectorsize > blocksize) {
if (ssflag)
- fprintf(stderr, _("illegal sector size %d\n"), sectorsize);
+ fprintf(stderr, _("illegal sector size %"PRIu64"\n"), sectorsize);
else
fprintf(stderr,
-_("block size %d cannot be smaller than logical sector size %d\n"),
+_("block size %"PRIu64" cannot be smaller than logical sector size %d\n"),
blocksize, ft.lsectorsize);
usage();
}
if (sectorsize < ft.lsectorsize) {
- fprintf(stderr, _("illegal sector size %d; hw sector is %d\n"),
+ fprintf(stderr, _("illegal sector size %"PRIu64"; hw sector is %d\n"),
sectorsize, ft.lsectorsize);
usage();
}
if (lsectorsize < XFS_MIN_SECTORSIZE ||
lsectorsize > XFS_MAX_SECTORSIZE || lsectorsize > blocksize) {
- fprintf(stderr, _("illegal log sector size %d\n"), lsectorsize);
+ fprintf(stderr, _("illegal log sector size %"PRIu64"\n"), lsectorsize);
usage();
} else if (lsectorsize > XFS_MIN_SECTORSIZE && !lsu && !lsunit) {
lsu = blocksize;
@@ -2167,7 +2167,7 @@ _("rmapbt not supported with realtime devices\n"));
if (nsflag || nlflag) {
if (dirblocksize < blocksize ||
dirblocksize > XFS_MAX_BLOCKSIZE) {
- fprintf(stderr, _("illegal directory block size %d\n"),
+ fprintf(stderr, _("illegal directory block size %"PRIu64"\n"),
dirblocksize);
usage();
}
@@ -2181,7 +2181,7 @@ _("rmapbt not supported with realtime devices\n"));
if (dsize) {
- __uint64_t dbytes;
+ uint64_t dbytes;
dbytes = getnum(dsize, &dopts, D_SIZE);
if (dbytes % XFS_MIN_BLOCKSIZE) {
@@ -2193,7 +2193,7 @@ _("rmapbt not supported with realtime devices\n"));
dblocks = (xfs_rfsblock_t)(dbytes >> blocklog);
if (dbytes % blocksize)
fprintf(stderr, _("warning: "
- "data length %lld not a multiple of %d, truncated to %lld\n"),
+ "data length %lld not a multiple of %"PRIu64", truncated to %lld\n"),
(long long)dbytes, blocksize,
(long long)(dblocks << blocklog));
}
@@ -2213,7 +2213,7 @@ _("rmapbt not supported with realtime devices\n"));
}
if (logsize) {
- __uint64_t logbytes;
+ uint64_t logbytes;
logbytes = getnum(logsize, &lopts, L_SIZE);
if (logbytes % XFS_MIN_BLOCKSIZE) {
@@ -2225,12 +2225,12 @@ _("rmapbt not supported with realtime devices\n"));
logblocks = (xfs_rfsblock_t)(logbytes >> blocklog);
if (logbytes % blocksize)
fprintf(stderr,
- _("warning: log length %lld not a multiple of %d, truncated to %lld\n"),
+ _("warning: log length %lld not a multiple of %"PRIu64", truncated to %lld\n"),
(long long)logbytes, blocksize,
(long long)(logblocks << blocklog));
}
if (rtsize) {
- __uint64_t rtbytes;
+ uint64_t rtbytes;
rtbytes = getnum(rtsize, &ropts, R_SIZE);
if (rtbytes % XFS_MIN_BLOCKSIZE) {
@@ -2242,7 +2242,7 @@ _("rmapbt not supported with realtime devices\n"));
rtblocks = (xfs_rfsblock_t)(rtbytes >> blocklog);
if (rtbytes % blocksize)
fprintf(stderr,
- _("warning: rt length %lld not a multiple of %d, truncated to %lld\n"),
+ _("warning: rt length %lld not a multiple of %"PRIu64", truncated to %lld\n"),
(long long)rtbytes, blocksize,
(long long)(rtblocks << blocklog));
}
@@ -2250,12 +2250,12 @@ _("rmapbt not supported with realtime devices\n"));
* If specified, check rt extent size against its constraints.
*/
if (rtextsize) {
- __uint64_t rtextbytes;
+ uint64_t rtextbytes;
rtextbytes = getnum(rtextsize, &ropts, R_EXTSIZE);
if (rtextbytes % blocksize) {
fprintf(stderr,
- _("illegal rt extent size %lld, not a multiple of %d\n"),
+ _("illegal rt extent size %lld, not a multiple of %"PRIu64"\n"),
(long long)rtextbytes, blocksize);
usage();
}
@@ -2266,8 +2266,8 @@ _("rmapbt not supported with realtime devices\n"));
* and the underlying volume is striped, then set rtextblocks
* to the stripe width.
*/
- __uint64_t rswidth;
- __uint64_t rtextbytes;
+ uint64_t rswidth;
+ uint64_t rtextbytes;
if (!norsflag && !xi.risfile && !(!rtsize && xi.disfile))
rswidth = ft.rtswidth;
@@ -2298,16 +2298,16 @@ _("rmapbt not supported with realtime devices\n"));
isize > XFS_DINODE_MAX_SIZE) {
int maxsz;
- fprintf(stderr, _("illegal inode size %d\n"), isize);
+ fprintf(stderr, _("illegal inode size %"PRIu64"\n"), isize);
maxsz = MIN(blocksize / XFS_MIN_INODE_PERBLOCK,
XFS_DINODE_MAX_SIZE);
if (XFS_DINODE_MIN_SIZE == maxsz)
fprintf(stderr,
- _("allowable inode size with %d byte blocks is %d\n"),
+ _("allowable inode size with %"PRIu64" byte blocks is %d\n"),
blocksize, XFS_DINODE_MIN_SIZE);
else
fprintf(stderr,
- _("allowable inode size with %d byte blocks is between %d and %d\n"),
+ _("allowable inode size with %"PRIu64" byte blocks is between %d and %d\n"),
blocksize, XFS_DINODE_MIN_SIZE, maxsz);
exit(1);
}
@@ -2345,10 +2345,10 @@ _("rmapbt not supported with realtime devices\n"));
* multiple of the sector size, or 1024, whichever is larger.
*/
- sector_mask = (__uint64_t)-1 << (MAX(sectorlog, 10) - BBSHIFT);
+ sector_mask = (uint64_t)-1 << (MAX(sectorlog, 10) - BBSHIFT);
xi.dsize &= sector_mask;
xi.rtsize &= sector_mask;
- xi.logBBsize &= (__uint64_t)-1 << (MAX(lsectorlog, 10) - BBSHIFT);
+ xi.logBBsize &= (uint64_t)-1 << (MAX(lsectorlog, 10) - BBSHIFT);
/* don't do discards on print-only runs or on files */
@@ -2411,19 +2411,19 @@ _("rmapbt not supported with realtime devices\n"));
if (xi.dbsize > sectorsize) {
fprintf(stderr, _(
-"Warning: the data subvolume sector size %u is less than the sector size \n\
+"Warning: the data subvolume sector size %"PRIu64" is less than the sector size \n\
reported by the device (%u).\n"),
sectorsize, xi.dbsize);
}
if (!loginternal && xi.lbsize > lsectorsize) {
fprintf(stderr, _(
-"Warning: the log subvolume sector size %u is less than the sector size\n\
+"Warning: the log subvolume sector size %"PRIu64" is less than the sector size\n\
reported by the device (%u).\n"),
lsectorsize, xi.lbsize);
}
if (rtsize && xi.rtsize > 0 && xi.rtbsize > sectorsize) {
fprintf(stderr, _(
-"Warning: the realtime subvolume sector size %u is less than the sector size\n\
+"Warning: the realtime subvolume sector size %"PRIu64" is less than the sector size\n\
reported by the device (%u).\n"),
sectorsize, xi.rtbsize);
}
@@ -2453,14 +2453,14 @@ reported by the device (%u).\n"),
if (dsunit) {
if (ft.dsunit && ft.dsunit != dsunit) {
fprintf(stderr,
- _("%s: Specified data stripe unit %d "
+ _("%s: Specified data stripe unit %"PRIu64" "
"is not the same as the volume stripe "
"unit %d\n"),
progname, dsunit, ft.dsunit);
}
if (ft.dswidth && ft.dswidth != dswidth) {
fprintf(stderr,
- _("%s: Specified data stripe width %d "
+ _("%s: Specified data stripe width %"PRIu64" "
"is not the same as the volume stripe "
"width %d\n"),
progname, dswidth, ft.dswidth);
@@ -2478,7 +2478,7 @@ reported by the device (%u).\n"),
*/
if (agsize % blocksize) {
fprintf(stderr,
- _("agsize (%lld) not a multiple of fs blk size (%d)\n"),
+ _("agsize (%lld) not a multiple of fs blk size (%"PRIu64")\n"),
(long long)agsize, blocksize);
usage();
}
@@ -2528,7 +2528,7 @@ reported by the device (%u).\n"),
(dblocks % agsize != 0);
if (dasize)
fprintf(stderr,
- _("agsize rounded to %lld, swidth = %d\n"),
+ _("agsize rounded to %lld, swidth = %"PRIu64"\n"),
(long long)agsize, dswidth);
} else {
if (nodsflag) {
@@ -2585,8 +2585,8 @@ an AG size that is one stripe unit smaller, for example %llu.\n"),
dsunit = dswidth = 0;
else {
fprintf(stderr,
- _("%s: Stripe unit(%d) or stripe width(%d) is "
- "not a multiple of the block size(%d)\n"),
+ _("%s: Stripe unit(%"PRIu64") or stripe width(%"PRIu64") is "
+ "not a multiple of the block size(%"PRIu64")\n"),
progname, BBTOB(dsunit), BBTOB(dswidth),
blocksize);
exit(1);
@@ -2626,7 +2626,7 @@ an AG size that is one stripe unit smaller, for example %llu.\n"),
/* Warn only if specified on commandline */
if (lsuflag || lsunitflag) {
fprintf(stderr,
- _("log stripe unit (%d bytes) is too large (maximum is 256KiB)\n"),
+ _("log stripe unit (%"PRIu64" bytes) is too large (maximum is 256KiB)\n"),
(lsunit * blocksize));
fprintf(stderr,
_("log stripe unit adjusted to 32KiB\n"));
@@ -2771,14 +2771,14 @@ _("size %s specified for log subvolume is too large, maximum is %lld blocks\n"),
if (!qflag || Nflag) {
printf(_(
- "meta-data=%-22s isize=%-6d agcount=%lld, agsize=%lld blks\n"
- " =%-22s sectsz=%-5u attr=%u, projid32bit=%u\n"
+ "meta-data=%-22s isize=%-6lu agcount=%lld, agsize=%lld blks\n"
+ " =%-22s sectsz=%-5lu attr=%u, projid32bit=%u\n"
" =%-22s crc=%-8u finobt=%u, sparse=%u, rmapbt=%u, reflink=%u\n"
- "data =%-22s bsize=%-6u blocks=%llu, imaxpct=%u\n"
- " =%-22s sunit=%-6u swidth=%u blks\n"
- "naming =version %-14u bsize=%-6u ascii-ci=%d ftype=%d\n"
+ "data =%-22s bsize=%-6lu blocks=%llu, imaxpct=%"PRIu64"\n"
+ " =%-22s sunit=%-6lu swidth=%"PRIu64" blks\n"
+ "naming =version %-14u bsize=%-6lu ascii-ci=%d ftype=%d\n"
"log =%-22s bsize=%-6d blocks=%lld, version=%d\n"
- " =%-22s sectsz=%-5u sunit=%d blks, lazy-count=%d\n"
+ " =%-22s sectsz=%-5lu sunit=%"PRIu64" blks, lazy-count=%d\n"
"realtime =%-22s extsz=%-6d blocks=%lld, rtextents=%lld\n"),
dfile, isize, (long long)agcount, (long long)agsize,
"", sectorsize, sb_feat.attr_version,
@@ -3431,17 +3431,17 @@ unknown(
usage();
}
-long long
+uint64_t
cvtnum(
unsigned int blksize,
unsigned int sectsize,
const char *s)
{
- long long i;
+ uint64_t i;
char *sp;
int c;
- i = strtoll(s, &sp, 0);
+ i = strtoull(s, &sp, 0);
if (i == 0 && sp == s)
return -1LL;
if (*sp == '\0')
--
2.1.4
--
To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
