From: Jan Tulak <jtulak@redhat.com>
To: linux-xfs@vger.kernel.org
Cc: Jan Tulak <jtulak@redhat.com>
Subject: [PATCH 15/22] mkfs: replace SUBOPT_NEEDS_VAL for a flag
Date: Wed, 7 Dec 2016 14:27:22 +0100 [thread overview]
Message-ID: <1481117249-21273-16-git-send-email-jtulak@redhat.com> (raw)
In-Reply-To: <1481117249-21273-1-git-send-email-jtulak@redhat.com>
Do not use a special value as a signal for a required value,
as it causes issues when we have more value types.
Signed-off-by: Jan Tulak <jtulak@redhat.com>
---
mkfs/xfs_mkfs.c | 93 +++++++++++++++++++++++++++++----------------------------
1 file changed, 48 insertions(+), 45 deletions(-)
diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index f7eb191..7ffe8ff 100644
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -44,7 +44,6 @@ unsigned int sectorsize;
#define MAX_OPTS 16
#define MAX_SUBOPTS 16
-#define SUBOPT_NEEDS_VAL (-1LL)
#define MAX_CONFLICTS 32
#define LAST_CONFLICT (-1)
@@ -193,14 +192,17 @@ unsigned int sectorsize;
* The value used if user specifies the subopt, but no value.
* If the subopt accepts some values (-d file=[1|0]), then this
* sets what is used with simple specifying the subopt (-d file).
- * A special SUBOPT_NEEDS_VAL can be used to require a user-given
- * value in any case.
*
* value INTERNAL
* Do not set this on initialization. Use flagval for what you want
* to do. This is filled with user input and anything you write here now
* is overwritten. (If the user input is a string and not a number, this
* value is set to a positive non-zero number.)
+ *
+ * needs_val OPTIONAL
+ * Set to true if, when user specifies the option, she has to specify
+ * a value too. That is, if needs_val is true, then it is not possible to
+ * use the subopt as a flag.
*/
struct opt_params {
int index;
@@ -225,6 +227,7 @@ struct opt_params {
long long maxval;
long long flagval;
long long value;
+ bool needs_val;
} subopt_params[MAX_SUBOPTS];
} opts[MAX_OPTS] = {
{
@@ -243,7 +246,7 @@ struct opt_params {
{LAST_CONFLICT} },
.minval = XFS_MIN_BLOCKSIZE_LOG,
.maxval = XFS_MAX_BLOCKSIZE_LOG,
- .flagval = SUBOPT_NEEDS_VAL,
+ .needs_val = true,
},
{ .index = B_SIZE,
.convert = true,
@@ -254,7 +257,7 @@ struct opt_params {
{LAST_CONFLICT} },
.minval = XFS_MIN_BLOCKSIZE,
.maxval = XFS_MAX_BLOCKSIZE,
- .flagval = SUBOPT_NEEDS_VAL,
+ .needs_val = true,
},
},
},
@@ -287,7 +290,7 @@ struct opt_params {
{LAST_CONFLICT} },
.minval = 1,
.maxval = XFS_MAX_AGNUMBER,
- .flagval = SUBOPT_NEEDS_VAL,
+ .needs_val = true,
},
{ .index = D_FILE,
.conflicts = { {LAST_CONFLICT} },
@@ -297,14 +300,14 @@ struct opt_params {
},
{ .index = D_NAME,
.conflicts = { {LAST_CONFLICT} },
- .flagval = SUBOPT_NEEDS_VAL,
+ .needs_val = true,
},
{ .index = D_SIZE,
.conflicts = { {LAST_CONFLICT} },
.convert = true,
.minval = XFS_AG_MIN_BYTES,
.maxval = LLONG_MAX,
- .flagval = SUBOPT_NEEDS_VAL,
+ .needs_val = true,
},
{ .index = D_SUNIT,
.conflicts = { {.opt = OPT_D,
@@ -319,7 +322,7 @@ struct opt_params {
{LAST_CONFLICT} },
.minval = 0,
.maxval = UINT_MAX,
- .flagval = SUBOPT_NEEDS_VAL,
+ .needs_val = true,
},
{ .index = D_SWIDTH,
.conflicts = { {.opt = OPT_D,
@@ -334,7 +337,7 @@ struct opt_params {
{LAST_CONFLICT} },
.minval = 0,
.maxval = UINT_MAX,
- .flagval = SUBOPT_NEEDS_VAL,
+ .needs_val = true,
},
{ .index = D_AGSIZE,
.conflicts = { {.opt = OPT_D,
@@ -344,7 +347,7 @@ struct opt_params {
.convert = true,
.minval = XFS_AG_MIN_BYTES,
.maxval = XFS_AG_MAX_BYTES,
- .flagval = SUBOPT_NEEDS_VAL,
+ .needs_val = true,
},
{ .index = D_SU,
.conflicts = { {.opt = OPT_D,
@@ -360,7 +363,7 @@ struct opt_params {
.convert = true,
.minval = 0,
.maxval = UINT_MAX,
- .flagval = SUBOPT_NEEDS_VAL,
+ .needs_val = true,
},
{ .index = D_SW,
.conflicts = { {.opt = OPT_D,
@@ -375,7 +378,7 @@ struct opt_params {
{LAST_CONFLICT} },
.minval = 0,
.maxval = UINT_MAX,
- .flagval = SUBOPT_NEEDS_VAL,
+ .needs_val = true,
},
{ .index = D_SECTLOG,
.conflicts = { {.opt = OPT_D,
@@ -384,7 +387,7 @@ struct opt_params {
{LAST_CONFLICT} },
.minval = XFS_MIN_SECTORSIZE_LOG,
.maxval = XFS_MAX_SECTORSIZE_LOG,
- .flagval = SUBOPT_NEEDS_VAL,
+ .needs_val = true,
},
{ .index = D_SECTSIZE,
.conflicts = { {.opt = OPT_D,
@@ -395,7 +398,7 @@ struct opt_params {
.is_power_2 = true,
.minval = XFS_MIN_SECTORSIZE,
.maxval = XFS_MAX_SECTORSIZE,
- .flagval = SUBOPT_NEEDS_VAL,
+ .needs_val = true,
},
{ .index = D_NOALIGN,
.conflicts = { {.opt = OPT_D,
@@ -425,13 +428,13 @@ struct opt_params {
.conflicts = { {LAST_CONFLICT} },
.minval = 0,
.maxval = UINT_MAX,
- .flagval = SUBOPT_NEEDS_VAL,
+ .needs_val = true,
},
{ .index = D_EXTSZINHERIT,
.conflicts = { {LAST_CONFLICT} },
.minval = 0,
.maxval = UINT_MAX,
- .flagval = SUBOPT_NEEDS_VAL,
+ .needs_val = true,
},
},
},
@@ -474,13 +477,13 @@ struct opt_params {
{LAST_CONFLICT} },
.minval = XFS_DINODE_MIN_LOG,
.maxval = XFS_DINODE_MAX_LOG,
- .flagval = SUBOPT_NEEDS_VAL,
+ .needs_val = true,
},
{ .index = I_MAXPCT,
.conflicts = { {LAST_CONFLICT} },
.minval = 0,
.maxval = 100,
- .flagval = SUBOPT_NEEDS_VAL,
+ .needs_val = true,
},
{ .index = I_PERBLOCK,
.conflicts = { {.opt = OPT_I,
@@ -493,7 +496,7 @@ struct opt_params {
.is_power_2 = true,
.minval = XFS_MIN_INODE_PERBLOCK,
.maxval = XFS_MAX_BLOCKSIZE / XFS_DINODE_MIN_SIZE,
- .flagval = SUBOPT_NEEDS_VAL,
+ .needs_val = true,
},
{ .index = I_SIZE,
.conflicts = { {.opt = OPT_I,
@@ -506,7 +509,7 @@ struct opt_params {
.is_power_2 = true,
.minval = XFS_DINODE_MIN_SIZE,
.maxval = XFS_DINODE_MAX_SIZE,
- .flagval = SUBOPT_NEEDS_VAL,
+ .needs_val = true,
},
{ .index = I_ATTR,
.conflicts = { {.opt = OPT_M,
@@ -520,7 +523,7 @@ struct opt_params {
{LAST_CONFLICT} },
.minval = 0,
.maxval = 2,
- .flagval = SUBOPT_NEEDS_VAL,
+ .needs_val = true,
},
{ .index = I_PROJID32BIT,
.conflicts = { {.opt = OPT_M,
@@ -579,7 +582,7 @@ struct opt_params {
{LAST_CONFLICT} },
.minval = 0,
.maxval = UINT_MAX,
- .flagval = SUBOPT_NEEDS_VAL,
+ .needs_val = true,
},
{ .index = L_INTERNAL,
.conflicts = { {.opt = OPT_L,
@@ -598,7 +601,7 @@ struct opt_params {
.convert = true,
.minval = 2 * 1024 * 1024LL, /* XXX: XFS_MIN_LOG_BYTES */
.maxval = XFS_MAX_LOG_BYTES,
- .flagval = SUBOPT_NEEDS_VAL,
+ .needs_val = true,
},
{ .index = L_VERSION,
.conflicts = {{.opt = OPT_M,
@@ -612,7 +615,7 @@ struct opt_params {
{LAST_CONFLICT} },
.minval = 1,
.maxval = 2,
- .flagval = SUBOPT_NEEDS_VAL,
+ .needs_val = true,
},
{ .index = L_SUNIT,
.conflicts = { {.opt = OPT_L,
@@ -621,7 +624,7 @@ struct opt_params {
{LAST_CONFLICT} },
.minval = 1,
.maxval = BTOBB(XLOG_MAX_RECORD_BSIZE),
- .flagval = SUBOPT_NEEDS_VAL,
+ .needs_val = true,
},
{ .index = L_SU,
.conflicts = { {.opt = OPT_L,
@@ -631,7 +634,7 @@ struct opt_params {
.convert = true,
.minval = BBTOB(1),
.maxval = XLOG_MAX_RECORD_BSIZE,
- .flagval = SUBOPT_NEEDS_VAL,
+ .needs_val = true,
},
{ .index = L_DEV,
.conflicts = { {.opt = OPT_L,
@@ -641,7 +644,7 @@ struct opt_params {
.subopt = L_INTERNAL,
},
{LAST_CONFLICT} },
- .flagval = SUBOPT_NEEDS_VAL,
+ .needs_val = true,
},
{ .index = L_SECTLOG,
.conflicts = { {.opt = OPT_L,
@@ -650,7 +653,7 @@ struct opt_params {
{LAST_CONFLICT} },
.minval = XFS_MIN_SECTORSIZE_LOG,
.maxval = XFS_MAX_SECTORSIZE_LOG,
- .flagval = SUBOPT_NEEDS_VAL,
+ .needs_val = true,
},
{ .index = L_SECTSIZE,
.conflicts = { {.opt = OPT_L,
@@ -661,7 +664,7 @@ struct opt_params {
.is_power_2 = true,
.minval = XFS_MIN_SECTORSIZE,
.maxval = XFS_MAX_SECTORSIZE,
- .flagval = SUBOPT_NEEDS_VAL,
+ .needs_val = true,
},
{ .index = L_FILE,
.conflicts = { {.opt = OPT_L,
@@ -680,7 +683,7 @@ struct opt_params {
.subopt = L_INTERNAL,
},
{LAST_CONFLICT} },
- .flagval = SUBOPT_NEEDS_VAL,
+ .needs_val = true,
},
{ .index = L_LAZYSBCNTR,
.conflicts = { {.opt = OPT_M,
@@ -716,7 +719,7 @@ struct opt_params {
{LAST_CONFLICT} },
.minval = XFS_MIN_REC_DIRSIZE,
.maxval = XFS_MAX_BLOCKSIZE_LOG,
- .flagval = SUBOPT_NEEDS_VAL,
+ .needs_val = true,
},
{ .index = N_SIZE,
.conflicts = { {.opt = OPT_N,
@@ -727,13 +730,13 @@ struct opt_params {
.is_power_2 = true,
.minval = 1 << XFS_MIN_REC_DIRSIZE,
.maxval = XFS_MAX_BLOCKSIZE,
- .flagval = SUBOPT_NEEDS_VAL,
+ .needs_val = true,
},
{ .index = N_VERSION,
.conflicts = { {LAST_CONFLICT} },
.minval = 2,
.maxval = 2,
- .flagval = SUBOPT_NEEDS_VAL,
+ .needs_val = true,
},
{ .index = N_FTYPE,
.conflicts = { {.opt = OPT_M,
@@ -769,14 +772,14 @@ struct opt_params {
.convert = true,
.minval = XFS_MIN_RTEXTSIZE,
.maxval = XFS_MAX_RTEXTSIZE,
- .flagval = SUBOPT_NEEDS_VAL,
+ .needs_val = true,
},
{ .index = R_SIZE,
.conflicts = { {LAST_CONFLICT} },
.convert = true,
.minval = 0,
.maxval = LLONG_MAX,
- .flagval = SUBOPT_NEEDS_VAL,
+ .needs_val = true,
},
{ .index = R_DEV,
.conflicts = { {.opt = OPT_M,
@@ -788,7 +791,7 @@ struct opt_params {
.message =
"rmapbt not supported without CRC support."},
{LAST_CONFLICT} },
- .flagval = SUBOPT_NEEDS_VAL,
+ .needs_val = true,
},
{ .index = R_FILE,
.minval = 0,
@@ -806,7 +809,7 @@ struct opt_params {
.message =
"rmapbt not supported without CRC support."},
{LAST_CONFLICT} },
- .flagval = SUBOPT_NEEDS_VAL,
+ .needs_val = true,
},
{ .index = R_NOALIGN,
.minval = 0,
@@ -837,7 +840,7 @@ struct opt_params {
{LAST_CONFLICT} },
.minval = XFS_MIN_SECTORSIZE_LOG,
.maxval = XFS_MAX_SECTORSIZE_LOG,
- .flagval = SUBOPT_NEEDS_VAL,
+ .needs_val = true,
},
{ .index = S_SECTLOG,
.conflicts = { {.opt = OPT_S,
@@ -849,7 +852,7 @@ struct opt_params {
{LAST_CONFLICT} },
.minval = XFS_MIN_SECTORSIZE_LOG,
.maxval = XFS_MAX_SECTORSIZE_LOG,
- .flagval = SUBOPT_NEEDS_VAL,
+ .needs_val = true,
},
{ .index = S_SIZE,
.conflicts = { {.opt = OPT_S,
@@ -863,7 +866,7 @@ struct opt_params {
.is_power_2 = true,
.minval = XFS_MIN_SECTORSIZE,
.maxval = XFS_MAX_SECTORSIZE,
- .flagval = SUBOPT_NEEDS_VAL,
+ .needs_val = true,
},
{ .index = S_SECTSIZE,
.conflicts = { {.opt = OPT_S,
@@ -877,7 +880,7 @@ struct opt_params {
.is_power_2 = true,
.minval = XFS_MIN_SECTORSIZE,
.maxval = XFS_MAX_SECTORSIZE,
- .flagval = SUBOPT_NEEDS_VAL,
+ .needs_val = true,
},
},
},
@@ -995,7 +998,7 @@ struct opt_params {
},
{ .index = M_UUID,
.conflicts = { {LAST_CONFLICT} },
- .flagval = SUBOPT_NEEDS_VAL,
+ .needs_val = true,
},
{ .index = M_RMAPBT,
.conflicts = { {.opt = OPT_M,
@@ -1039,7 +1042,7 @@ struct opt_params {
{LAST_CONFLICT} },
.minval = 0,
.maxval = 1,
- .flagval = 0,
+ .needs_val = true,
},
},
},
@@ -1715,7 +1718,7 @@ getnum(
/* empty strings might just return a default value */
if (!str || *str == '\0') {
- if (sp->flagval == SUBOPT_NEEDS_VAL)
+ if (sp->needs_val)
reqval(opts->name, (char **)opts->subopts, index);
sp->seen = true;
return sp->flagval;
--
2.8.1
next prev parent reply other threads:[~2016-12-07 13:36 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-07 13:27 [RFC PATCH 00/22] mkfs.xfs: Make stronger conflict checks Jan Tulak
2016-12-07 13:27 ` [PATCH 01/22] mkfs: remove intermediate getstr followed by getnum Jan Tulak
2017-01-13 16:56 ` Bill O'Donnell
2016-12-07 13:27 ` [PATCH 02/22] mkfs: merge tables for opts parsing into one table Jan Tulak
2017-01-13 16:57 ` Bill O'Donnell
2016-12-07 13:27 ` [PATCH 03/22] mkfs: extend opt_params with a value field Jan Tulak
2017-01-13 16:55 ` Bill O'Donnell
2017-01-16 12:42 ` Jan Tulak
2016-12-07 13:27 ` [PATCH 04/22] mkfs: change conflicts array into a table capable of cross-option addressing Jan Tulak
2017-01-13 17:56 ` Bill O'Donnell
2016-12-07 13:27 ` [PATCH 05/22] mkfs: add a check for conflicting values Jan Tulak
2017-01-13 17:58 ` Bill O'Donnell
2016-12-07 13:27 ` [PATCH 06/22] mkfs: add cross-section conflict checks Jan Tulak
2017-01-13 21:18 ` Bill O'Donnell
2016-12-07 13:27 ` [PATCH 07/22] mkfs: Move opts related #define to one place Jan Tulak
2017-01-13 21:19 ` Bill O'Donnell
2016-12-07 13:27 ` [PATCH 08/22] mkfs: move conflicts into the table Jan Tulak
2017-01-13 21:20 ` Bill O'Donnell
2016-12-07 13:27 ` [PATCH 09/22] mkfs: change conflict checks to utilize the new conflict structure Jan Tulak
2017-01-13 17:08 ` Bill O'Donnell
2017-01-16 12:42 ` Jan Tulak
2016-12-07 13:27 ` [PATCH 10/22] mkfs: change when to mark an option as seen Jan Tulak
2017-01-13 21:20 ` Bill O'Donnell
2016-12-07 13:27 ` [PATCH 11/22] mkfs: add test_default_value into conflict struct Jan Tulak
2017-01-13 21:21 ` Bill O'Donnell
2016-12-07 13:27 ` [PATCH 12/22] mkfs: expand conflicts declarations to named declaration Jan Tulak
2017-01-13 17:21 ` Bill O'Donnell
2016-12-07 13:27 ` [PATCH 13/22] mkfs: remove zeroed items from conflicts declaration Jan Tulak
2017-01-16 14:13 ` Bill O'Donnell
2016-12-07 13:27 ` [PATCH 14/22] mkfs: rename defaultval to flagval in opts Jan Tulak
2017-01-16 14:14 ` Bill O'Donnell
2016-12-07 13:27 ` Jan Tulak [this message]
2017-01-16 14:14 ` [PATCH 15/22] mkfs: replace SUBOPT_NEEDS_VAL for a flag Bill O'Donnell
2016-12-07 13:27 ` [PATCH 16/22] mkfs: Change all value fields in opt structures into unions Jan Tulak
2017-01-13 17:36 ` Bill O'Donnell
2017-01-16 12:44 ` Jan Tulak
2016-12-07 13:27 ` [PATCH 17/22] mkfs: use old variables as pointers to the new opts struct values Jan Tulak
2017-01-13 17:43 ` Bill O'Donnell
2017-01-16 12:45 ` Jan Tulak
2016-12-07 13:27 ` [PATCH 18/22] mkfs: prevent sector/blocksize to be specified as a number of blocks Jan Tulak
2017-01-16 14:15 ` Bill O'Donnell
2016-12-07 13:27 ` [PATCH 19/22] mkfs: subopt flags should be saved as bool Jan Tulak
2017-01-16 14:16 ` Bill O'Donnell
2016-12-07 13:27 ` [PATCH 20/22] mkfs: move uuid empty string test to getstr() Jan Tulak
2017-01-16 14:16 ` Bill O'Donnell
2016-12-07 13:27 ` [PATCH 21/22] mkfs: remove duplicit checks Jan Tulak
2017-01-16 14:17 ` Bill O'Donnell
2016-12-07 13:27 ` [PATCH 22/22] mkfs: prevent multiple specifications of a single option Jan Tulak
2017-01-16 14:18 ` Bill O'Donnell
2017-01-06 11:42 ` [RFC PATCH 00/22] mkfs.xfs: Make stronger conflict checks Jan Tulak
2017-01-09 19:43 ` Eric Sandeen
2017-01-10 9:47 ` Jan Tulak
2017-01-12 15:46 ` Bill O'Donnell
2017-01-16 20:14 ` Bill O'Donnell
2017-03-15 15:59 [PATCH " Jan Tulak
2017-03-15 16:00 ` [PATCH 15/22] mkfs: replace SUBOPT_NEEDS_VAL for a flag 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=1481117249-21273-16-git-send-email-jtulak@redhat.com \
--to=jtulak@redhat.com \
--cc=linux-xfs@vger.kernel.org \
/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.