| Message ID | 160375511989.879169.8816363379781873320.stgit@magnolia (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | xfsprogs: fixes for 5.10 | expand |
On 10/26/20 4:31 PM, Darrick J. Wong wrote: > From: Darrick J. Wong <darrick.wong@oracle.com> > > mkfs has quite a few boolean options that can be specified in several > ways: "option=1" (turn it on), "option" (turn it on), or "option=0" > (turn it off). For whatever reason, rtinherit sticks out as the only > mkfs parameter that doesn't behave that way. Let's make it behave the > same as all the other boolean variables. > Looks ok Reviewed-by: Allison Henderson <allison.henderson@oracle.com> > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> > --- > mkfs/xfs_mkfs.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > > diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c > index 8fe149d74b0a..908d520df909 100644 > --- a/mkfs/xfs_mkfs.c > +++ b/mkfs/xfs_mkfs.c > @@ -349,7 +349,7 @@ static struct opt_params dopts = { > }, > { .index = D_RTINHERIT, > .conflicts = { { NULL, LAST_CONFLICT } }, > - .minval = 1, > + .minval = 0, > .maxval = 1, > .defaultval = 1, > }, > @@ -1429,6 +1429,8 @@ data_opts_parser( > case D_RTINHERIT: > if (getnum(value, opts, subopt)) > cli->fsx.fsx_xflags |= FS_XFLAG_RTINHERIT; > + else > + cli->fsx.fsx_xflags &= ~FS_XFLAG_RTINHERIT; > break; > case D_PROJINHERIT: > cli->fsx.fsx_projid = getnum(value, opts, subopt); >
On 10/26/20 6:31 PM, Darrick J. Wong wrote: > From: Darrick J. Wong <darrick.wong@oracle.com> > > mkfs has quite a few boolean options that can be specified in several > ways: "option=1" (turn it on), "option" (turn it on), or "option=0" > (turn it off). For whatever reason, rtinherit sticks out as the only > mkfs parameter that doesn't behave that way. Let's make it behave the > same as all the other boolean variables. Seems fine; tho looking over mkfs.xfs.8, I think we could clarify what all the valid ${FOO}inherit=[value] values are, in general. Reviewed-by: Eric Sandeen <sandeen@redhat.com> -Eric > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> > --- > mkfs/xfs_mkfs.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > > diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c > index 8fe149d74b0a..908d520df909 100644 > --- a/mkfs/xfs_mkfs.c > +++ b/mkfs/xfs_mkfs.c > @@ -349,7 +349,7 @@ static struct opt_params dopts = { > }, > { .index = D_RTINHERIT, > .conflicts = { { NULL, LAST_CONFLICT } }, > - .minval = 1, > + .minval = 0, > .maxval = 1, > .defaultval = 1, > }, > @@ -1429,6 +1429,8 @@ data_opts_parser( > case D_RTINHERIT: > if (getnum(value, opts, subopt)) > cli->fsx.fsx_xflags |= FS_XFLAG_RTINHERIT; > + else > + cli->fsx.fsx_xflags &= ~FS_XFLAG_RTINHERIT; > break; > case D_PROJINHERIT: > cli->fsx.fsx_projid = getnum(value, opts, subopt); >
Looks good,
Reviewed-by: Christoph Hellwig <hch@lst.de>
diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c index 8fe149d74b0a..908d520df909 100644 --- a/mkfs/xfs_mkfs.c +++ b/mkfs/xfs_mkfs.c @@ -349,7 +349,7 @@ static struct opt_params dopts = { }, { .index = D_RTINHERIT, .conflicts = { { NULL, LAST_CONFLICT } }, - .minval = 1, + .minval = 0, .maxval = 1, .defaultval = 1, }, @@ -1429,6 +1429,8 @@ data_opts_parser( case D_RTINHERIT: if (getnum(value, opts, subopt)) cli->fsx.fsx_xflags |= FS_XFLAG_RTINHERIT; + else + cli->fsx.fsx_xflags &= ~FS_XFLAG_RTINHERIT; break; case D_PROJINHERIT: cli->fsx.fsx_projid = getnum(value, opts, subopt);