mkfs: table based parsing for converted parameters

All the parameters that can be passed as block or sector sizes need
to be passed the block and sector sizes that they should be using
for conversion. For parameter parsing, it is always the same two
variables, so to make things easy just declare them as global
variables so we can avoid needing to pass them to getnum_checked().

We also need to mark these parameters are requiring conversion so
that we don't need to pass this information manually to
getnum_checked(). Further, some of these options are required to
have a power of 2 value, so add optional checking for that as well.

[ Eric Sandeen <sandeen@redhat.com>: fix min/max for "-l su" ]

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Jan Tulak <jtulak@redhat.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index 3634d07517b84607dddcf5b33b13575b45c808a8..78c6ccd67e5620491a5f29bad168b2727bc835f7 100644 (file)
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -48,6 +48,13 @@ static int  ispow2(unsigned int i);
 static long long cvtnum(unsigned int blocksize,
                        unsigned int sectorsize, const char *s);
 
+/*
+ * 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;
+
 #define MAX_SUBOPTS    16
 #define SUBOPT_NEEDS_VAL       (-1LL)
 /*
@@ -76,6 +83,15 @@ static long long cvtnum(unsigned int blocksize,
  *     Do not set this flag when definning a subopt. It is used to remeber that
  *     this subopt was already seen, for example for conflicts detection.
  *
+ *   convert OPTIONAL
+ *     A flag signalling whether the user-given value can use suffixes.
+ *     If you want to allow the use of user-friendly values like 13k, 42G,
+ *     set it to true.
+ *
+ *   is_power_2 OPTIONAL
+ *     An optional flag for subopts where the given value has to be a power
+ *     of two.
+ *
  *   minval, maxval OPTIONAL
  *     These options are used for automatic range check and they have to be
  *     always used together in pair. If you don't want to limit the max value,
@@ -103,6 +119,8 @@ struct opt_params {
        struct subopt_param {
                int             index;
                bool            seen;
+               bool            convert;
+               bool            is_power_2;
                long long       minval;
                long long       maxval;
                long long       defaultval;
@@ -125,6 +143,8 @@ struct opt_params bopts = {
                  .defaultval = SUBOPT_NEEDS_VAL,
                },
                { .index = B_SIZE,
+                 .convert = true,
+                 .is_power_2 = true,
                  .minval = XFS_MIN_BLOCKSIZE,
                  .maxval = XFS_MAX_BLOCKSIZE,
                  .defaultval = SUBOPT_NEEDS_VAL,
@@ -182,6 +202,9 @@ struct opt_params dopts = {
                  .defaultval = SUBOPT_NEEDS_VAL,
                },
                { .index = D_SIZE,
+                 .convert = true,
+                 .minval = XFS_AG_MIN_BYTES,
+                 .maxval = LLONG_MAX,
                  .defaultval = SUBOPT_NEEDS_VAL,
                },
                { .index = D_SUNIT,
@@ -195,11 +218,15 @@ struct opt_params dopts = {
                  .defaultval = SUBOPT_NEEDS_VAL,
                },
                { .index = D_AGSIZE,
+                 .convert = true,
                  .minval = XFS_AG_MIN_BYTES,
                  .maxval = XFS_AG_MAX_BYTES,
                  .defaultval = SUBOPT_NEEDS_VAL,
                },
                { .index = D_SU,
+                 .convert = true,
+                 .minval = 0,
+                 .maxval = UINT_MAX,
                  .defaultval = SUBOPT_NEEDS_VAL,
                },
                { .index = D_SW,
@@ -213,6 +240,8 @@ struct opt_params dopts = {
                  .defaultval = SUBOPT_NEEDS_VAL,
                },
                { .index = D_SECTSIZE,
+                 .convert = true,
+                 .is_power_2 = true,
                  .minval = XFS_MIN_SECTORSIZE,
                  .maxval = XFS_MAX_SECTORSIZE,
                  .defaultval = SUBOPT_NEEDS_VAL,
@@ -279,11 +308,13 @@ struct opt_params iopts = {
                  .defaultval = SUBOPT_NEEDS_VAL,
                },
                { .index = I_PERBLOCK,
+                 .is_power_2 = true,
                  .minval = XFS_MIN_INODE_PERBLOCK,
                  .maxval = XFS_MAX_BLOCKSIZE / XFS_DINODE_MIN_SIZE,
                  .defaultval = SUBOPT_NEEDS_VAL,
                },
                { .index = I_SIZE,
+                 .is_power_2 = true,
                  .minval = XFS_DINODE_MIN_SIZE,
                  .maxval = XFS_DINODE_MAX_SIZE,
                  .defaultval = SUBOPT_NEEDS_VAL,
@@ -347,6 +378,9 @@ struct opt_params lopts = {
                  .defaultval = 1,
                },
                { .index = L_SIZE,
+                 .convert = true,
+                 .minval = 2 * 1024 * 1024LL,  /* XXX: XFS_MIN_LOG_BYTES */
+                 .maxval = XFS_MAX_LOG_BYTES,
                  .defaultval = SUBOPT_NEEDS_VAL,
                },
                { .index = L_VERSION,
@@ -360,6 +394,9 @@ struct opt_params lopts = {
                  .defaultval = SUBOPT_NEEDS_VAL,
                },
                { .index = L_SU,
+                 .convert = true,
+                 .minval = XLOG_MIN_RECORD_BSIZE,
+                 .maxval = XLOG_MAX_RECORD_BSIZE,
                  .defaultval = SUBOPT_NEEDS_VAL,
                },
                { .index = L_DEV,
@@ -371,6 +408,8 @@ struct opt_params lopts = {
                  .defaultval = SUBOPT_NEEDS_VAL,
                },
                { .index = L_SECTSIZE,
+                 .convert = true,
+                 .is_power_2 = true,
                  .minval = XFS_MIN_SECTORSIZE,
                  .maxval = XFS_MAX_SECTORSIZE,
                  .defaultval = SUBOPT_NEEDS_VAL,
@@ -411,6 +450,8 @@ struct opt_params nopts = {
                  .defaultval = SUBOPT_NEEDS_VAL,
                },
                { .index = N_SIZE,
+                 .convert = true,
+                 .is_power_2 = true,
                  .minval = 1 << XFS_MIN_REC_DIRSIZE,
                  .maxval = XFS_MAX_BLOCKSIZE,
                  .defaultval = SUBOPT_NEEDS_VAL,
@@ -447,9 +488,15 @@ struct opt_params ropts = {
        },
        .subopt_params = {
                { .index = R_EXTSIZE,
+                 .convert = true,
+                 .minval = XFS_MIN_RTEXTSIZE,
+                 .maxval = XFS_MAX_RTEXTSIZE,
                  .defaultval = SUBOPT_NEEDS_VAL,
                },
                { .index = R_SIZE,
+                 .convert = true,
+                 .minval = 0,
+                 .maxval = LLONG_MAX,
                  .defaultval = SUBOPT_NEEDS_VAL,
                },
                { .index = R_DEV,
@@ -496,11 +543,15 @@ struct opt_params sopts = {
                  .defaultval = SUBOPT_NEEDS_VAL,
                },
                { .index = S_SIZE,
+                 .convert = true,
+                 .is_power_2 = true,
                  .minval = XFS_MIN_SECTORSIZE,
                  .maxval = XFS_MAX_SECTORSIZE,
                  .defaultval = SUBOPT_NEEDS_VAL,
                },
                { .index = S_SECTSIZE,
+                 .convert = true,
+                 .is_power_2 = true,
                  .minval = XFS_MIN_SECTORSIZE,
                  .maxval = XFS_MAX_SECTORSIZE,
                  .defaultval = SUBOPT_NEEDS_VAL,
@@ -1332,15 +1383,15 @@ sb_set_features(
 long long
 getnum(
        const char      *str,
-       unsigned int    blocksize,
-       unsigned int    sectorsize,
+       unsigned int    blksize,
+       unsigned int    sectsize,
        bool            convert)
 {
        long long       i;
        char            *sp;
 
        if (convert)
-               return cvtnum(blocksize, sectorsize, str);
+               return cvtnum(blksize, sectsize, str);
 
        i = strtoll(str, &sp, 0);
        if (i == 0 && sp == str)
@@ -1362,7 +1413,7 @@ illegal_option(
        usage();
 }
 
-static int
+static long long
 getnum_checked(
        const char              *str,
        struct opt_params       *opts,
@@ -1397,9 +1448,11 @@ getnum_checked(
                exit(1);
        }
 
-       c = getnum(str, 0, 0, false);
+       c = getnum(str, blocksize, sectorsize, sp->convert);
        if (c < sp->minval || c > sp->maxval)
                illegal_option(str, opts, index);
+       if (sp->is_power_2 && !ispow2(c))
+               illegal_option(str, opts, index);
        return c;
 }
 
@@ -1417,7 +1470,6 @@ main(
        struct xfs_btree_block  *block;
        int                     blflag;
        int                     blocklog;
-       unsigned int            blocksize;
        int                     bsflag;
        int                     bsize;
        xfs_buf_t               *buf;
@@ -1488,7 +1540,6 @@ main(
        char                    *rtsize;
        xfs_sb_t                *sbp;
        int                     sectorlog;
-       unsigned int            sectorsize;
        __uint64_t              sector_mask;
        int                     slflag;
        int                     ssflag;
@@ -1567,18 +1618,11 @@ main(
                                        blflag = 1;
                                        break;
                                case B_SIZE:
-                                       if (!value || *value == '\0')
-                                               reqval('b', subopts, B_SIZE);
-                                       if (bsflag)
-                                               respec('b', subopts, B_SIZE);
                                        if (blflag)
                                                conflict('b', subopts, B_LOG,
                                                         B_SIZE);
-                                       blocksize = getnum(value, blocksize,
-                                                       sectorsize, true);
-                                       if (blocksize <= 0 ||
-                                           !ispow2(blocksize))
-                                               illegal(value, "b size");
+                                       blocksize = getnum_checked(value, &bopts,
+                                                                 B_SIZE);
                                        blocklog = libxfs_highbit32(blocksize);
                                        bsflag = 1;
                                        break;
@@ -1601,14 +1645,8 @@ main(
                                        daflag = 1;
                                        break;
                                case D_AGSIZE:
-                                       if (!value || *value == '\0')
-                                               reqval('d', subopts, D_AGSIZE);
-                                       if (dasize)
-                                               respec('d', subopts, D_AGSIZE);
-                                       agsize = getnum(value, blocksize,
-                                                       sectorsize, true);
-                                       if ((__int64_t)agsize <= 0)
-                                               illegal(value, "d agsize");
+                                       agsize = getnum_checked(value, &dopts,
+                                                                D_AGSIZE);
                                        dasize = 1;
                                        break;
                                case D_FILE:
@@ -1646,17 +1684,11 @@ main(
                                                                 D_SWIDTH);
                                        break;
                                case D_SU:
-                                       if (!value || *value == '\0')
-                                               reqval('d', subopts, D_SU);
-                                       if (dsu)
-                                               respec('d', subopts, D_SU);
                                        if (nodsflag)
                                                conflict('d', subopts, D_NOALIGN,
                                                         D_SU);
-                                       dsu = getnum(value, blocksize,
-                                                    sectorsize, true);
-                                       if (dsu < 0)
-                                               illegal(value, "d su");
+                                       dsu = getnum_checked(value, &dopts,
+                                                                D_SU);
                                        break;
                                case D_SW:
                                        if (nodsflag)
@@ -1693,18 +1725,11 @@ main(
                                        slflag = 1;
                                        break;
                                case D_SECTSIZE:
-                                       if (!value || *value == '\0')
-                                               reqval('d', subopts, D_SECTSIZE);
-                                       if (ssflag)
-                                               respec('d', subopts, D_SECTSIZE);
                                        if (slflag)
                                                conflict('d', subopts, D_SECTLOG,
                                                         D_SECTSIZE);
-                                       sectorsize = getnum(value, blocksize,
-                                                           sectorsize, true);
-                                       if (sectorsize <= 0 ||
-                                           !ispow2(sectorsize))
-                                               illegal(value, "d sectsize");
+                                       sectorsize = getnum_checked(value,
+                                                       &dopts, D_SECTSIZE);
                                        sectorlog =
                                                libxfs_highbit32(sectorsize);
                                        ssflag = 1;
@@ -1771,8 +1796,6 @@ main(
                                                         I_PERBLOCK);
                                        inopblock = getnum_checked(value, &iopts,
                                                                   I_PERBLOCK);
-                                       if (!ispow2(inopblock))
-                                               illegal(value, "i perblock");
                                        ipflag = 1;
                                        break;
                                case I_SIZE:
@@ -1784,8 +1807,6 @@ main(
                                                         I_SIZE);
                                        isize = getnum_checked(value, &iopts,
                                                               I_SIZE);
-                                       if (!ispow2(isize))
-                                               illegal(value, "i size");
                                        inodelog = libxfs_highbit32(isize);
                                        isflag = 1;
                                        break;
@@ -1844,14 +1865,8 @@ main(
                                        liflag = 1;
                                        break;
                                case L_SU:
-                                       if (!value || *value == '\0')
-                                               reqval('l', subopts, L_SU);
-                                       if (lsu)
-                                               respec('l', subopts, L_SU);
-                                       lsu = getnum(value, blocksize,
-                                                    sectorsize, true);
-                                       if (lsu < 0)
-                                               illegal(value, "l su");
+                                       lsu = getnum_checked(value, &lopts,
+                                                                L_SU);
                                        lsuflag = 1;
                                        break;
                                case L_SUNIT:
@@ -1898,18 +1913,11 @@ main(
                                        lslflag = 1;
                                        break;
                                case L_SECTSIZE:
-                                       if (!value || *value == '\0')
-                                               reqval('l', subopts, L_SECTSIZE);
-                                       if (lssflag)
-                                               respec('l', subopts, L_SECTSIZE);
                                        if (lslflag)
                                                conflict('l', subopts, L_SECTLOG,
                                                         L_SECTSIZE);
-                                       lsectorsize = getnum(value, blocksize,
-                                                            sectorsize, true);
-                                       if (lsectorsize <= 0 ||
-                                           !ispow2(lsectorsize))
-                                               illegal(value, "l sectsize");
+                                       lsectorsize = getnum_checked(value,
+                                                       &lopts, L_SECTSIZE);
                                        lsectorlog =
                                                libxfs_highbit32(lsectorsize);
                                        lssflag = 1;
@@ -1977,18 +1985,11 @@ main(
                                        nlflag = 1;
                                        break;
                                case N_SIZE:
-                                       if (!value || *value == '\0')
-                                               reqval('n', subopts, N_SIZE);
-                                       if (nsflag)
-                                               respec('n', subopts, N_SIZE);
                                        if (nlflag)
                                                conflict('n', subopts, N_LOG,
                                                         N_SIZE);
-                                       dirblocksize = getnum(value, blocksize,
-                                                             sectorsize, true);
-                                       if (dirblocksize <= 0 ||
-                                           !ispow2(dirblocksize))
-                                               illegal(value, "n size");
+                                       dirblocksize = getnum_checked(value,
+                                                               &nopts, N_SIZE);
                                        dirblocklog =
                                                libxfs_highbit32(dirblocksize);
                                        nsflag = 1;
@@ -2099,18 +2100,11 @@ main(
                                        break;
                                case S_SIZE:
                                case S_SECTSIZE:
-                                       if (!value || *value == '\0')
-                                               reqval('s', subopts, S_SECTSIZE);
-                                       if (ssflag || lssflag)
-                                               respec('s', subopts, S_SECTSIZE);
                                        if (slflag || lslflag)
                                                conflict('s', subopts, S_SECTLOG,
                                                         S_SECTSIZE);
-                                       sectorsize = getnum(value, blocksize,
-                                                           sectorsize, true);
-                                       if (sectorsize <= 0 ||
-                                           !ispow2(sectorsize))
-                                               illegal(value, "s sectsize");
+                                       sectorsize = getnum_checked(value,
+                                                       &sopts, S_SECTSIZE);
                                        lsectorsize = sectorsize;
                                        sectorlog =
                                                libxfs_highbit32(sectorsize);
@@ -2339,9 +2333,7 @@ _("warning: sparse inodes not supported without CRC support, disabled.\n"));
        if (dsize) {
                __uint64_t dbytes;
 
-               dbytes = getnum(dsize, blocksize, sectorsize, true);
-               if ((__int64_t)dbytes < 0)
-                       illegal(dsize, "d size");
+               dbytes = getnum_checked(dsize, &dopts, D_SIZE);
                if (dbytes % XFS_MIN_BLOCKSIZE) {
                        fprintf(stderr,
                        _("illegal data length %lld, not a multiple of %d\n"),
@@ -2378,9 +2370,7 @@ _("warning: sparse inodes not supported without CRC support, disabled.\n"));
        if (logsize) {
                __uint64_t logbytes;
 
-               logbytes = getnum(logsize, blocksize, sectorsize, true);
-               if ((__int64_t)logbytes < 0)
-                       illegal(logsize, "l size");
+               logbytes = getnum_checked(logsize, &lopts, L_SIZE);
                if (logbytes % XFS_MIN_BLOCKSIZE) {
                        fprintf(stderr,
                        _("illegal log length %lld, not a multiple of %d\n"),
@@ -2402,9 +2392,7 @@ _("warning: sparse inodes not supported without CRC support, disabled.\n"));
        if (rtsize) {
                __uint64_t rtbytes;
 
-               rtbytes = getnum(rtsize, blocksize, sectorsize, true);
-               if ((__int64_t)rtbytes < 0)
-                       illegal(rtsize, "r size");
+               rtbytes = getnum_checked(rtsize, &ropts, R_SIZE);
                if (rtbytes % XFS_MIN_BLOCKSIZE) {
                        fprintf(stderr,
                        _("illegal rt length %lld, not a multiple of %d\n"),
@@ -2424,27 +2412,13 @@ _("warning: sparse inodes not supported without CRC support, disabled.\n"));
        if (rtextsize) {
                __uint64_t rtextbytes;
 
-               rtextbytes = getnum(rtextsize, blocksize, sectorsize, true);
-               if ((__int64_t)rtextbytes < 0)
-                       illegal(rtsize, "r extsize");
+               rtextbytes = getnum_checked(rtextsize, &ropts, R_EXTSIZE);
                if (rtextbytes % blocksize) {
                        fprintf(stderr,
                _("illegal rt extent size %lld, not a multiple of %d\n"),
                                (long long)rtextbytes, blocksize);
                        usage();
                }
-               if (rtextbytes > XFS_MAX_RTEXTSIZE) {
-                       fprintf(stderr,
-                               _("rt extent size %s too large, maximum %d\n"),
-                               rtextsize, XFS_MAX_RTEXTSIZE);
-                       usage();
-               }
-               if (rtextbytes < XFS_MIN_RTEXTSIZE) {
-                       fprintf(stderr,
-                               _("rt extent size %s too small, minimum %d\n"),
-                               rtextsize, XFS_MIN_RTEXTSIZE);
-                       usage();
-               }
                rtextblocks = (xfs_extlen_t)(rtextbytes >> blocklog);
        } else {
                /*