From: Eric Sandeen <sandeen@sandeen.net>
To: xfs@oss.sgi.com
Subject: Re: [PATCH 10/19] mkfs: add respecification detection to generic parsing
Date: Thu, 7 Apr 2016 14:06:12 -0500 [thread overview]
Message-ID: <5706AFA4.2060105@sandeen.net> (raw)
In-Reply-To: <1458818136-56043-11-git-send-email-jtulak@redhat.com>
On 3/24/16 6:15 AM, jtulak@redhat.com wrote:
> From: Dave Chinner <dchinner@redhat.com>
>
> CHANGE:
> o Add description of new members in opt_params struct.
> o Drop "const" from struct opt_params - a previous patch was changed to
> not create it as const.
>
> Add flags to the generic input parameter tables so that
> respecification can be detected in a generic manner.
>
> Signed-off-by: Dave Chinner <dchinner@redhat.com>
> Signed-off-by: Jan Tulak <jtulak@redhat.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
> ---
> mkfs/xfs_mkfs.c | 64 ++++++++++++++++-----------------------------------------
> 1 file changed, 18 insertions(+), 46 deletions(-)
>
> diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
> index 021d682..a8dd304 100644
> --- a/mkfs/xfs_mkfs.c
> +++ b/mkfs/xfs_mkfs.c
> @@ -72,6 +72,10 @@ static long long cvtnum(unsigned int blocksize,
> * it is. The index has to be the same as is the order in subopts list,
> * so we can access the right item both in subopt_param and subopts.
> *
> + * seen INTERNAL
> + * 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.
> + *
> * 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,
> @@ -95,8 +99,10 @@ static long long cvtnum(unsigned int blocksize,
> struct opt_params {
> const char name;
> const char *subopts[MAX_SUBOPTS];
> +
> struct subopt_param {
> int index;
> + bool seen;
> long long minval;
> long long maxval;
> long long defaultval;
> @@ -1227,7 +1233,6 @@ struct sb_feat_args {
> int dir_version;
> int spinodes;
> int finobt;
> - bool finobtflag;
> bool inode_align;
> bool nci;
> bool lazy_sb_counters;
> @@ -1363,7 +1368,7 @@ getnum_checked(
> struct opt_params *opts,
> int index)
> {
> - const struct subopt_param *sp = &opts->subopt_params[index];
> + struct subopt_param *sp = &opts->subopt_params[index];
> long long c;
>
> if (sp->index != index) {
> @@ -1373,6 +1378,11 @@ getnum_checked(
> reqval(opts->name, (char **)opts->subopts, index);
> }
>
> + /* check for respecification of the option */
> + if (sp->seen)
> + respec(opts->name, (char **)opts->subopts, index);
> + sp->seen = true;
> +
> if (!str || *str == '\0') {
> if (sp->defaultval == SUBOPT_NEEDS_VAL)
> reqval(opts->name, (char **)opts->subopts, index);
> @@ -1490,7 +1500,6 @@ main(
> struct fs_topology ft;
> struct sb_feat_args sb_feat = {
> .finobt = 1,
> - .finobtflag = false,
> .spinodes = 0,
> .log_version = 2,
> .attr_version = 2,
> @@ -1552,8 +1561,6 @@ main(
> switch (getsubopt(&p, (constpp)subopts,
> &value)) {
> case B_LOG:
> - if (blflag)
> - respec('b', subopts, B_LOG);
> if (bsflag)
> conflict('b', subopts, B_SIZE,
> B_LOG);
> @@ -1592,9 +1599,6 @@ main(
> switch (getsubopt(&p, (constpp)subopts,
> &value)) {
> case D_AGCOUNT:
> - if (daflag)
> - respec('d', subopts, D_AGCOUNT);
> -
> agcount = getnum_checked(value, &dopts,
> D_AGCOUNT);
> daflag = 1;
> @@ -1631,8 +1635,6 @@ main(
> dsize = value;
> break;
> case D_SUNIT:
> - if (dsunit)
> - respec('d', subopts, D_SUNIT);
> if (nodsflag)
> conflict('d', subopts, D_NOALIGN,
> D_SUNIT);
> @@ -1640,8 +1642,6 @@ main(
> D_SUNIT);
> break;
> case D_SWIDTH:
> - if (dswidth)
> - respec('d', subopts, D_SWIDTH);
> if (nodsflag)
> conflict('d', subopts, D_NOALIGN,
> D_SWIDTH);
> @@ -1662,8 +1662,6 @@ main(
> illegal(value, "d su");
> break;
> case D_SW:
> - if (dsw)
> - respec('d', subopts, D_SW);
> if (nodsflag)
> conflict('d', subopts, D_NOALIGN,
> D_SW);
> @@ -1689,8 +1687,6 @@ main(
> }
> break;
> case D_SECTLOG:
> - if (slflag)
> - respec('d', subopts, D_SECTLOG);
> if (ssflag)
> conflict('d', subopts, D_SECTSIZE,
> D_SECTLOG);
> @@ -1753,8 +1749,6 @@ main(
> value, &iopts, I_ALIGN);
> break;
> case I_LOG:
> - if (ilflag)
> - respec('i', subopts, I_LOG);
> if (ipflag)
> conflict('i', subopts, I_PERBLOCK,
> I_LOG);
> @@ -1767,18 +1761,14 @@ main(
> ilflag = 1;
> break;
> case I_MAXPCT:
> - if (imflag)
> - respec('i', subopts, I_MAXPCT);
> - imaxpct = getnum_checked(
> - value, &iopts, I_MAXPCT);
> + imaxpct = getnum_checked(value, &iopts,
> + I_MAXPCT);
> imflag = 1;
> break;
> case I_PERBLOCK:
> if (ilflag)
> conflict('i', subopts, I_LOG,
> I_PERBLOCK);
> - if (ipflag)
> - respec('i', subopts, I_PERBLOCK);
> if (isflag)
> conflict('i', subopts, I_SIZE,
> I_PERBLOCK);
> @@ -1795,8 +1785,6 @@ main(
> if (ipflag)
> conflict('i', subopts, I_PERBLOCK,
> I_SIZE);
> - if (isflag)
> - respec('i', subopts, I_SIZE);
> isize = getnum_checked(value, &iopts,
> I_SIZE);
> if (!ispow2(isize))
> @@ -1832,8 +1820,6 @@ main(
> switch (getsubopt(&p, (constpp)subopts,
> &value)) {
> case L_AGNUM:
> - if (laflag)
> - respec('l', subopts, L_AGNUM);
> if (ldflag)
> conflict('l', subopts, L_AGNUM, L_DEV);
> logagno = getnum_checked(value, &lopts,
> @@ -1855,8 +1841,6 @@ main(
> if (xi.lisfile)
> conflict('l', subopts, L_FILE,
> L_INTERNAL);
> - if (liflag)
> - respec('l', subopts, L_INTERNAL);
>
> loginternal = getnum_checked(value,
> &lopts, L_INTERNAL);
> @@ -1874,8 +1858,6 @@ main(
> lsuflag = 1;
> break;
> case L_SUNIT:
> - if (lsunit)
> - respec('l', subopts, L_SUNIT);
> lsunit = getnum_checked(value, &lopts,
> L_SUNIT);
> lsunitflag = 1;
> @@ -1896,10 +1878,9 @@ main(
> xi.logname = value;
> break;
> case L_VERSION:
> - if (lvflag)
> - respec('l', subopts, L_VERSION);
> - sb_feat.log_version = getnum_checked(
> - value, &lopts, L_VERSION);
> + sb_feat.log_version =
> + getnum_checked(value, &lopts,
> + L_VERSION);
> lvflag = 1;
> break;
> case L_SIZE:
> @@ -1911,8 +1892,6 @@ main(
> lsflag = 1;
> break;
> case L_SECTLOG:
> - if (lslflag)
> - respec('l', subopts, L_SECTLOG);
> if (lssflag)
> conflict('l', subopts, L_SECTSIZE,
> L_SECTLOG);
> @@ -1974,7 +1953,6 @@ _("cannot specify both -m crc=1 and -n ftype\n"));
> sb_feat.dirftype = true;
> break;
> case M_FINOBT:
> - sb_feat.finobtflag = true;
> sb_feat.finobt = getnum_checked(
> value, &mopts, M_FINOBT);
> break;
> @@ -1998,8 +1976,6 @@ _("cannot specify both -m crc=1 and -n ftype\n"));
> switch (getsubopt(&p, (constpp)subopts,
> &value)) {
> case N_LOG:
> - if (nlflag)
> - respec('n', subopts, N_LOG);
> if (nsflag)
> conflict('n', subopts, N_SIZE,
> N_LOG);
> @@ -2042,8 +2018,6 @@ _("cannot specify both -m crc=1 and -n ftype\n"));
> nvflag = 1;
> break;
> case N_FTYPE:
> - if (nftype)
> - respec('n', subopts, N_FTYPE);
> if (sb_feat.crcs_enabled) {
> fprintf(stderr,
> _("cannot specify both -m crc=1 and -n ftype\n"));
> @@ -2127,8 +2101,6 @@ _("cannot specify both -m crc=1 and -n ftype\n"));
> &value)) {
> case S_LOG:
> case S_SECTLOG:
> - if (slflag || lslflag)
> - respec('s', subopts, S_SECTLOG);
> if (ssflag || lssflag)
> conflict('s', subopts,
> S_SECTSIZE, S_SECTLOG);
> @@ -2340,7 +2312,7 @@ _("32 bit Project IDs always enabled on CRC enabled filesytems\n"));
> * them off.
> */
> if (sb_feat.finobt){
> - if (sb_feat.finobtflag) {
> + if (mopts.subopt_params[M_FINOBT].seen) {
> fprintf(stderr,
> _("warning: finobt not supported without CRC support, disabled.\n"));
> }
>
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2016-04-07 19:06 UTC|newest]
Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-24 11:15 [PATCH 00/19] mkfs cleaning jtulak
2016-03-24 11:15 ` [PATCH 01/19] xfsprogs: use common code for multi-disk detection jtulak
2016-03-31 20:25 ` Eric Sandeen
2016-04-06 9:05 ` Jan Tulak
2016-03-24 11:15 ` [PATCH 02/19] mkfs: sanitise ftype parameter values jtulak
2016-03-24 16:33 ` Eric Sandeen
2016-03-29 16:11 ` Jan Tulak
2016-03-29 16:17 ` Eric Sandeen
2016-03-29 16:20 ` Jan Tulak
2016-03-29 17:14 ` Jan Tulak
2016-03-24 11:15 ` [PATCH 03/19] mkfs: Sanitise the superblock feature macros jtulak
2016-04-01 2:05 ` Eric Sandeen
2016-04-06 9:12 ` Jan Tulak
2016-04-06 21:01 ` Dave Chinner
2016-04-07 11:53 ` Jan Tulak
2016-04-07 0:12 ` Eric Sandeen
2016-04-07 1:43 ` Eric Sandeen
2016-04-07 13:09 ` Jan Tulak
2016-04-07 13:18 ` Eric Sandeen
2016-04-07 13:27 ` Jan Tulak
2016-03-24 11:15 ` [PATCH 04/19] mkfs: validate all input values jtulak
2016-04-06 23:02 ` Eric Sandeen
2016-04-07 11:15 ` Jan Tulak
2016-03-24 11:15 ` [PATCH 05/19] mkfs: factor boolean option parsing jtulak
2016-04-07 2:48 ` Eric Sandeen
2016-03-24 11:15 ` [PATCH 06/19] mkfs: validate logarithmic parameters sanely jtulak
2016-04-07 2:52 ` Eric Sandeen
2016-03-24 11:15 ` [PATCH 07/19] mkfs: structify input parameter passing jtulak
2016-04-07 3:14 ` Eric Sandeen
2016-04-07 11:43 ` Jan Tulak
2016-03-24 11:15 ` [PATCH 08/19] mkfs: getbool is redundant jtulak
2016-04-07 17:25 ` Eric Sandeen
2016-04-08 10:30 ` Jan Tulak
2016-04-08 17:41 ` Eric Sandeen
2016-03-24 11:15 ` [PATCH 09/19] mkfs: use getnum_checked for all ranged parameters jtulak
2016-04-07 19:02 ` Eric Sandeen
2016-04-08 10:47 ` Jan Tulak
2016-04-08 15:52 ` Eric Sandeen
2016-03-24 11:15 ` [PATCH 10/19] mkfs: add respecification detection to generic parsing jtulak
2016-04-07 19:06 ` Eric Sandeen [this message]
2016-03-24 11:15 ` [PATCH 11/19] mkfs: table based parsing for converted parameters jtulak
2016-04-07 19:08 ` Eric Sandeen
2016-03-24 11:15 ` [PATCH 12/19] mkfs: merge getnum jtulak
2016-04-07 19:14 ` Eric Sandeen
2016-03-24 11:15 ` [PATCH 13/19] mkfs: encode conflicts into parsing table jtulak
2016-04-07 22:40 ` Eric Sandeen
2016-03-24 11:15 ` [PATCH 14/19] mkfs: add string options to generic parsing jtulak
2016-04-07 22:49 ` Eric Sandeen
2016-03-24 11:15 ` [PATCH 15/19] mkfs: don't treat files as though they are block devices jtulak
2016-04-08 0:25 ` Eric Sandeen
2016-04-08 0:32 ` Eric Sandeen
2016-04-08 14:58 ` Jan Tulak
2016-04-08 15:50 ` Eric Sandeen
2016-04-08 15:56 ` Jan Tulak
2016-04-09 4:12 ` Eric Sandeen
2016-04-13 15:43 ` Jan Tulak
2016-04-14 9:49 ` Jan Tulak
2016-04-20 9:51 ` Jan Tulak
2016-04-20 13:17 ` Jan Tulak
2016-04-20 16:53 ` Eric Sandeen
2016-04-21 9:22 ` Jan Tulak
2016-03-24 11:15 ` [PATCH 16/19] mkfs: move spinodes crc check jtulak
2016-03-24 11:15 ` [PATCH 17/19] xfsprogs: disable truncating of files jtulak
2016-04-06 21:42 ` Eric Sandeen
2016-04-07 9:41 ` Jan Tulak
2016-04-08 0:09 ` Dave Chinner
2016-04-08 10:06 ` Jan Tulak
2016-04-08 23:08 ` Dave Chinner
2016-04-13 15:08 ` Jan Tulak
2016-04-13 16:17 ` Eric Sandeen
2016-04-13 16:23 ` Jan Tulak
2016-04-13 16:25 ` Eric Sandeen
2016-04-13 21:37 ` Dave Chinner
2016-04-14 12:31 ` Jan Tulak
2016-03-24 11:15 ` [PATCH 18/19] mkfs: unit conversions are case insensitive jtulak
2016-04-06 21:10 ` Eric Sandeen
2016-04-07 10:50 ` Jan Tulak
2016-04-08 0:41 ` Eric Sandeen
2016-04-08 1:03 ` Dave Chinner
2016-04-08 9:08 ` Jan Tulak
2016-04-08 15:51 ` Eric Sandeen
2016-03-24 11:15 ` [PATCH 19/19] mkfs: add optional 'reason' for illegal_option jtulak
2016-04-06 22:23 ` Eric Sandeen
-- strict thread matches above, loose matches on Subject: below --
2016-04-21 9:39 [PATCH 00/19 v2] mkfs cleaning Jan Tulak
2016-04-21 9:39 ` [PATCH 10/19] mkfs: add respecification detection to generic parsing Jan Tulak
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=5706AFA4.2060105@sandeen.net \
--to=sandeen@sandeen.net \
--cc=xfs@oss.sgi.com \
/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.