| Message ID | 20170811123058.16061-2-jtulak@redhat.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
On Fri, Aug 11, 2017 at 02:30:53PM +0200, Jan Tulak wrote: > Save the parsed values from users into the opts table. This will ensure > that the user values gets there and are validated, but we are not yet > using them for anything - the usage makes a lot of changes through the > code, so it is better if that is separated into smaller chunks. > > Signed-off-by: Jan Tulak <jtulak@redhat.com> > --- > Edit: > * sectorizes fix > * remove collateral assignments that are now covered within parse > function > * remove duplicit assignments into opts within one option > * fix issue with proj(16|32)bit > * updated description > --- > mkfs/xfs_mkfs.c | 239 +++++++++++++++++++++++++++++++++----------------------- > 1 file changed, 142 insertions(+), 97 deletions(-) > > diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c > index 61ef09e8..12ffa715 100644 > --- a/mkfs/xfs_mkfs.c > +++ b/mkfs/xfs_mkfs.c > @@ -1826,14 +1826,15 @@ main( > > switch (getsubopt(&p, subopts, &value)) { > case B_LOG: > - blocklog = getnum(value, &opts[OPT_B], > - B_LOG); > + blocklog = parse_conf_val(OPT_B, B_LOG, > + value); Eww, look at those arguments jammed up against the RHS of the screen. Now I really wish these were separate functions (or anything that reduces the amount of indentation, really...) But rebashing your whole mkfs series to fix minor whitespace problems is probably a PITA, so I'll defer to Eric on this one. Personally I'd just throw an extra patch on the end to do it. :) Otherwise, this looks ok, Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> --D > blocksize = 1 << blocklog; > blflag = 1; > break; > case B_SIZE: > - blocksize = getnum(value, &opts[OPT_B], > - B_SIZE); > + blocksize = parse_conf_val(OPT_B, > + B_SIZE, > + value); > blocklog = libxfs_highbit32(blocksize); > bsflag = 1; > break; > @@ -1851,80 +1852,92 @@ main( > > switch (getsubopt(&p, subopts, &value)) { > case D_AGCOUNT: > - agcount = getnum(value, &opts[OPT_D], > - D_AGCOUNT); > + agcount = parse_conf_val(OPT_D, > + D_AGCOUNT, > + value); > daflag = 1; > break; > case D_AGSIZE: > - agsize = getnum(value, &opts[OPT_D], > - D_AGSIZE); > + agsize = parse_conf_val(OPT_D, > + D_AGSIZE, > + value); > dasize = 1; > break; > case D_FILE: > - xi.disfile = getnum(value, > - &opts[OPT_D], D_FILE); > + xi.disfile = parse_conf_val(OPT_D, > + D_FILE, > + value); > break; > case D_NAME: > xi.dname = getstr(value, &opts[OPT_D], > D_NAME); > + set_conf_val(OPT_D, D_NAME, 1); > break; > case D_SIZE: > - dbytes = getnum(value, &opts[OPT_D], > - D_SIZE); > + dbytes = parse_conf_val(OPT_D, D_SIZE, > + value); > break; > case D_SUNIT: > - dsunit = getnum(value, &opts[OPT_D], > - D_SUNIT); > + dsunit = parse_conf_val(OPT_D, D_SUNIT, > + value); > dsflag = 1; > break; > case D_SWIDTH: > - dswidth = getnum(value, &opts[OPT_D], > - D_SWIDTH); > + dswidth = parse_conf_val(OPT_D, > + D_SWIDTH, > + value); > dsflag = 1; > break; > case D_SU: > - dsu = getnum(value, &opts[OPT_D], > - D_SU); > + dsu = parse_conf_val(OPT_D, D_SU, > + value); > dsflag = 1; > break; > case D_SW: > - dsw = getnum(value, &opts[OPT_D], > - D_SW); > + dsw = parse_conf_val(OPT_D, D_SW, > + value); > dsflag = 1; > break; > case D_NOALIGN: > - nodsflag = getnum(value, &opts[OPT_D], > - D_NOALIGN); > + nodsflag = parse_conf_val(OPT_D, > + D_NOALIGN, > + value); > break; > case D_SECTLOG: > - sectorlog = getnum(value, &opts[OPT_D], > - D_SECTLOG); > + sectorlog = parse_conf_val(OPT_D, > + D_SECTLOG, > + value); > sectorsize = 1 << sectorlog; > slflag = 1; > break; > case D_SECTSIZE: > - sectorsize = getnum(value, > - &opts[OPT_D], D_SECTSIZE); > + sectorsize = parse_conf_val(OPT_D, > + D_SECTSIZE, > + value); > sectorlog = > libxfs_highbit32(sectorsize); > ssflag = 1; > break; > case D_RTINHERIT: > - c = getnum(value, &opts[OPT_D], > - D_RTINHERIT); > + c = parse_conf_val(OPT_D, D_RTINHERIT, > + value); > if (c) > fsx.fsx_xflags |= > XFS_DIFLAG_RTINHERIT; > break; > case D_PROJINHERIT: > - fsx.fsx_projid = getnum(value, > - &opts[OPT_D], D_PROJINHERIT); > + fsx.fsx_projid = > + parse_conf_val(OPT_D, > + D_PROJINHERIT, > + value); > fsx.fsx_xflags |= > XFS_DIFLAG_PROJINHERIT; > break; > case D_EXTSZINHERIT: > - fsx.fsx_extsize = getnum(value, > - &opts[OPT_D], D_EXTSZINHERIT); > + fsx.fsx_extsize = > + parse_conf_val(OPT_D, > + D_EXTSZINHERIT, > + value); > fsx.fsx_xflags |= > XFS_DIFLAG_EXTSZINHERIT; > break; > @@ -1942,45 +1955,49 @@ main( > > switch (getsubopt(&p, subopts, &value)) { > case I_ALIGN: > - sb_feat.inode_align = getnum(value, > - &opts[OPT_I], I_ALIGN); > + sb_feat.inode_align = > + parse_conf_val(OPT_I, I_ALIGN, > + value); > break; > case I_LOG: > - inodelog = getnum(value, &opts[OPT_I], > - I_LOG); > + inodelog = parse_conf_val(OPT_I, I_LOG, > + value); > isize = 1 << inodelog; > ilflag = 1; > break; > case I_MAXPCT: > - imaxpct = getnum(value, &opts[OPT_I], > - I_MAXPCT); > + imaxpct = parse_conf_val(OPT_I, > + I_MAXPCT, > + value); > imflag = 1; > break; > case I_PERBLOCK: > - inopblock = getnum(value, &opts[OPT_I], > - I_PERBLOCK); > + inopblock = parse_conf_val(OPT_I, > + I_PERBLOCK, > + value); > ipflag = 1; > break; > case I_SIZE: > - isize = getnum(value, &opts[OPT_I], > - I_SIZE); > + isize = parse_conf_val(OPT_I, I_SIZE, > + value); > inodelog = libxfs_highbit32(isize); > isflag = 1; > break; > case I_ATTR: > sb_feat.attr_version = > - getnum(value, &opts[OPT_I], > - I_ATTR); > + parse_conf_val(OPT_I, I_ATTR, > + value); > break; > case I_PROJID32BIT: > sb_feat.projid16bit = > - !getnum(value, &opts[OPT_I], > - I_PROJID32BIT); > + !parse_conf_val(OPT_I, > + I_PROJID32BIT, value); > break; > case I_SPINODES: > - sb_feat.spinodes = getnum(value, > - &opts[OPT_I], > - I_SPINODES); > + sb_feat.spinodes = > + parse_conf_val(OPT_I, > + I_SPINODES, > + value); > break; > default: > unknown('i', value); > @@ -1996,27 +2013,31 @@ main( > > switch (getsubopt(&p, subopts, &value)) { > case L_AGNUM: > - logagno = getnum(value, &opts[OPT_L], > - L_AGNUM); > + logagno = parse_conf_val(OPT_L, > + L_AGNUM, > + value); > laflag = 1; > break; > case L_FILE: > - xi.lisfile = getnum(value, > - &opts[OPT_L], L_FILE); > + xi.lisfile = parse_conf_val(OPT_L, > + L_FILE, > + value); > break; > case L_INTERNAL: > - loginternal = getnum(value, > - &opts[OPT_L], L_INTERNAL); > + loginternal = > + parse_conf_val(OPT_L, > + L_INTERNAL, > + value); > liflag = 1; > break; > case L_SU: > - lsu = getnum(value, &opts[OPT_L], > - L_SU); > + lsu = parse_conf_val(OPT_L, L_SU, > + value); > lsuflag = 1; > break; > case L_SUNIT: > - lsunit = getnum(value, &opts[OPT_L], > - L_SUNIT); > + lsunit = parse_conf_val(OPT_L, L_SUNIT, > + value); > lsunitflag = 1; > break; > case L_NAME: > @@ -2026,34 +2047,42 @@ main( > xi.logname = logfile; > ldflag = 1; > loginternal = 0; > + set_conf_val(OPT_L, L_NAME, 1); > + set_conf_val(OPT_L, L_DEV, 1); > break; > case L_VERSION: > sb_feat.log_version = > - getnum(value, &opts[OPT_L], > - L_VERSION); > + parse_conf_val(OPT_L, > + L_VERSION, > + value); > lvflag = 1; > break; > case L_SIZE: > - logbytes = getnum(value, > - &opts[OPT_L], L_SIZE); > + logbytes = parse_conf_val(OPT_L, > + L_SIZE, > + value); > break; > case L_SECTLOG: > - lsectorlog = getnum(value, > - &opts[OPT_L], L_SECTLOG); > + lsectorlog = parse_conf_val(OPT_L, > + L_SECTLOG, > + value); > lsectorsize = 1 << lsectorlog; > lslflag = 1; > break; > case L_SECTSIZE: > - lsectorsize = getnum(value, > - &opts[OPT_L], L_SECTSIZE); > + lsectorsize = > + parse_conf_val(OPT_L, > + L_SECTSIZE, > + value); > lsectorlog = > libxfs_highbit32(lsectorsize); > lssflag = 1; > break; > case L_LAZYSBCNTR: > sb_feat.lazy_sb_counters = > - getnum(value, &opts[OPT_L], > - L_LAZYSBCNTR); > + parse_conf_val(OPT_L, > + L_LAZYSBCNTR, > + value); > break; > default: > unknown('l', value); > @@ -2075,29 +2104,33 @@ main( > switch (getsubopt(&p, subopts, &value)) { > case M_CRC: > sb_feat.crcs_enabled = > - getnum(value, &opts[OPT_M], > - M_CRC); > + parse_conf_val(OPT_M, M_CRC, > + value); > if (sb_feat.crcs_enabled) > sb_feat.dirftype = true; > break; > case M_FINOBT: > - sb_feat.finobt = getnum( > - value, &opts[OPT_M], M_FINOBT); > + sb_feat.finobt = > + parse_conf_val(OPT_M, M_FINOBT, > + value); > break; > case M_UUID: > if (!value || *value == '\0') > reqval('m', subopts, M_UUID); > if (platform_uuid_parse(value, &uuid)) > illegal(optarg, "m uuid"); > + set_conf_val(OPT_M, M_UUID, 1); > break; > case M_RMAPBT: > - sb_feat.rmapbt = getnum( > - value, &opts[OPT_M], M_RMAPBT); > + sb_feat.rmapbt = > + parse_conf_val(OPT_M, M_RMAPBT, > + value); > break; > case M_REFLINK: > sb_feat.reflink = > - getnum(value, &opts[OPT_M], > - M_REFLINK); > + parse_conf_val(OPT_M, > + M_REFLINK, > + value); > break; > default: > unknown('m', value); > @@ -2113,14 +2146,16 @@ main( > > switch (getsubopt(&p, subopts, &value)) { > case N_LOG: > - dirblocklog = getnum(value, > - &opts[OPT_N], N_LOG); > + dirblocklog = parse_conf_val(OPT_N, > + N_LOG, > + value); > dirblocksize = 1 << dirblocklog; > nlflag = 1; > break; > case N_SIZE: > - dirblocksize = getnum(value, > - &opts[OPT_N], N_SIZE); > + dirblocksize = parse_conf_val(OPT_N, > + N_SIZE, > + value); > dirblocklog = > libxfs_highbit32(dirblocksize); > nsflag = 1; > @@ -2134,14 +2169,17 @@ main( > } else { > sb_feat.dir_version = > getnum(value, > - &opts[OPT_N], > - N_VERSION); > + &opts[OPT_N], > + N_VERSION); > } > nvflag = 1; > + set_conf_val(OPT_N, N_VERSION, > + sb_feat.dir_version); > break; > case N_FTYPE: > - sb_feat.dirftype = getnum(value, > - &opts[OPT_N], N_FTYPE); > + sb_feat.dirftype = > + parse_conf_val(OPT_N, N_FTYPE, > + value); > break; > default: > unknown('n', value); > @@ -2171,25 +2209,30 @@ main( > > switch (getsubopt(&p, subopts, &value)) { > case R_EXTSIZE: > - rtextbytes = getnum(value, > - &opts[OPT_R], R_EXTSIZE); > + rtextbytes = parse_conf_val(OPT_R, > + R_EXTSIZE, > + value); > break; > case R_FILE: > - xi.risfile = getnum(value, > - &opts[OPT_R], R_FILE); > + xi.risfile = parse_conf_val(OPT_R, > + R_FILE, > + value); > break; > case R_NAME: > case R_DEV: > xi.rtname = getstr(value, &opts[OPT_R], > R_NAME); > + set_conf_val(OPT_R, R_NAME, 1); > + set_conf_val(OPT_R, R_DEV, 1); > break; > case R_SIZE: > - rtbytes = getnum(value, &opts[OPT_R], > - R_SIZE); > + rtbytes = parse_conf_val(OPT_R, R_SIZE, > + value); > break; > case R_NOALIGN: > - norsflag = getnum(value, &opts[OPT_R], > - R_NOALIGN); > + norsflag = parse_conf_val(OPT_R, > + R_NOALIGN, > + value); > break; > default: > unknown('r', value); > @@ -2210,8 +2253,9 @@ main( > conflict('s', subopts, > S_SECTSIZE, > S_SECTLOG); > - sectorlog = getnum(value, &opts[OPT_S], > - S_SECTLOG); > + sectorlog = parse_conf_val(OPT_S, > + S_SECTLOG, > + value); > lsectorlog = sectorlog; > sectorsize = 1 << sectorlog; > lsectorsize = sectorsize; > @@ -2223,8 +2267,9 @@ main( > conflict('s', subopts, > S_SECTLOG, > S_SECTSIZE); > - sectorsize = getnum(value, > - &opts[OPT_S], S_SECTSIZE); > + sectorsize = parse_conf_val(OPT_S, > + S_SECTSIZE, > + value); > lsectorsize = sectorsize; > sectorlog = > libxfs_highbit32(sectorsize); > -- > 2.13.3 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c index 61ef09e8..12ffa715 100644 --- a/mkfs/xfs_mkfs.c +++ b/mkfs/xfs_mkfs.c @@ -1826,14 +1826,15 @@ main( switch (getsubopt(&p, subopts, &value)) { case B_LOG: - blocklog = getnum(value, &opts[OPT_B], - B_LOG); + blocklog = parse_conf_val(OPT_B, B_LOG, + value); blocksize = 1 << blocklog; blflag = 1; break; case B_SIZE: - blocksize = getnum(value, &opts[OPT_B], - B_SIZE); + blocksize = parse_conf_val(OPT_B, + B_SIZE, + value); blocklog = libxfs_highbit32(blocksize); bsflag = 1; break; @@ -1851,80 +1852,92 @@ main( switch (getsubopt(&p, subopts, &value)) { case D_AGCOUNT: - agcount = getnum(value, &opts[OPT_D], - D_AGCOUNT); + agcount = parse_conf_val(OPT_D, + D_AGCOUNT, + value); daflag = 1; break; case D_AGSIZE: - agsize = getnum(value, &opts[OPT_D], - D_AGSIZE); + agsize = parse_conf_val(OPT_D, + D_AGSIZE, + value); dasize = 1; break; case D_FILE: - xi.disfile = getnum(value, - &opts[OPT_D], D_FILE); + xi.disfile = parse_conf_val(OPT_D, + D_FILE, + value); break; case D_NAME: xi.dname = getstr(value, &opts[OPT_D], D_NAME); + set_conf_val(OPT_D, D_NAME, 1); break; case D_SIZE: - dbytes = getnum(value, &opts[OPT_D], - D_SIZE); + dbytes = parse_conf_val(OPT_D, D_SIZE, + value); break; case D_SUNIT: - dsunit = getnum(value, &opts[OPT_D], - D_SUNIT); + dsunit = parse_conf_val(OPT_D, D_SUNIT, + value); dsflag = 1; break; case D_SWIDTH: - dswidth = getnum(value, &opts[OPT_D], - D_SWIDTH); + dswidth = parse_conf_val(OPT_D, + D_SWIDTH, + value); dsflag = 1; break; case D_SU: - dsu = getnum(value, &opts[OPT_D], - D_SU); + dsu = parse_conf_val(OPT_D, D_SU, + value); dsflag = 1; break; case D_SW: - dsw = getnum(value, &opts[OPT_D], - D_SW); + dsw = parse_conf_val(OPT_D, D_SW, + value); dsflag = 1; break; case D_NOALIGN: - nodsflag = getnum(value, &opts[OPT_D], - D_NOALIGN); + nodsflag = parse_conf_val(OPT_D, + D_NOALIGN, + value); break; case D_SECTLOG: - sectorlog = getnum(value, &opts[OPT_D], - D_SECTLOG); + sectorlog = parse_conf_val(OPT_D, + D_SECTLOG, + value); sectorsize = 1 << sectorlog; slflag = 1; break; case D_SECTSIZE: - sectorsize = getnum(value, - &opts[OPT_D], D_SECTSIZE); + sectorsize = parse_conf_val(OPT_D, + D_SECTSIZE, + value); sectorlog = libxfs_highbit32(sectorsize); ssflag = 1; break; case D_RTINHERIT: - c = getnum(value, &opts[OPT_D], - D_RTINHERIT); + c = parse_conf_val(OPT_D, D_RTINHERIT, + value); if (c) fsx.fsx_xflags |= XFS_DIFLAG_RTINHERIT; break; case D_PROJINHERIT: - fsx.fsx_projid = getnum(value, - &opts[OPT_D], D_PROJINHERIT); + fsx.fsx_projid = + parse_conf_val(OPT_D, + D_PROJINHERIT, + value); fsx.fsx_xflags |= XFS_DIFLAG_PROJINHERIT; break; case D_EXTSZINHERIT: - fsx.fsx_extsize = getnum(value, - &opts[OPT_D], D_EXTSZINHERIT); + fsx.fsx_extsize = + parse_conf_val(OPT_D, + D_EXTSZINHERIT, + value); fsx.fsx_xflags |= XFS_DIFLAG_EXTSZINHERIT; break; @@ -1942,45 +1955,49 @@ main( switch (getsubopt(&p, subopts, &value)) { case I_ALIGN: - sb_feat.inode_align = getnum(value, - &opts[OPT_I], I_ALIGN); + sb_feat.inode_align = + parse_conf_val(OPT_I, I_ALIGN, + value); break; case I_LOG: - inodelog = getnum(value, &opts[OPT_I], - I_LOG); + inodelog = parse_conf_val(OPT_I, I_LOG, + value); isize = 1 << inodelog; ilflag = 1; break; case I_MAXPCT: - imaxpct = getnum(value, &opts[OPT_I], - I_MAXPCT); + imaxpct = parse_conf_val(OPT_I, + I_MAXPCT, + value); imflag = 1; break; case I_PERBLOCK: - inopblock = getnum(value, &opts[OPT_I], - I_PERBLOCK); + inopblock = parse_conf_val(OPT_I, + I_PERBLOCK, + value); ipflag = 1; break; case I_SIZE: - isize = getnum(value, &opts[OPT_I], - I_SIZE); + isize = parse_conf_val(OPT_I, I_SIZE, + value); inodelog = libxfs_highbit32(isize); isflag = 1; break; case I_ATTR: sb_feat.attr_version = - getnum(value, &opts[OPT_I], - I_ATTR); + parse_conf_val(OPT_I, I_ATTR, + value); break; case I_PROJID32BIT: sb_feat.projid16bit = - !getnum(value, &opts[OPT_I], - I_PROJID32BIT); + !parse_conf_val(OPT_I, + I_PROJID32BIT, value); break; case I_SPINODES: - sb_feat.spinodes = getnum(value, - &opts[OPT_I], - I_SPINODES); + sb_feat.spinodes = + parse_conf_val(OPT_I, + I_SPINODES, + value); break; default: unknown('i', value); @@ -1996,27 +2013,31 @@ main( switch (getsubopt(&p, subopts, &value)) { case L_AGNUM: - logagno = getnum(value, &opts[OPT_L], - L_AGNUM); + logagno = parse_conf_val(OPT_L, + L_AGNUM, + value); laflag = 1; break; case L_FILE: - xi.lisfile = getnum(value, - &opts[OPT_L], L_FILE); + xi.lisfile = parse_conf_val(OPT_L, + L_FILE, + value); break; case L_INTERNAL: - loginternal = getnum(value, - &opts[OPT_L], L_INTERNAL); + loginternal = + parse_conf_val(OPT_L, + L_INTERNAL, + value); liflag = 1; break; case L_SU: - lsu = getnum(value, &opts[OPT_L], - L_SU); + lsu = parse_conf_val(OPT_L, L_SU, + value); lsuflag = 1; break; case L_SUNIT: - lsunit = getnum(value, &opts[OPT_L], - L_SUNIT); + lsunit = parse_conf_val(OPT_L, L_SUNIT, + value); lsunitflag = 1; break; case L_NAME: @@ -2026,34 +2047,42 @@ main( xi.logname = logfile; ldflag = 1; loginternal = 0; + set_conf_val(OPT_L, L_NAME, 1); + set_conf_val(OPT_L, L_DEV, 1); break; case L_VERSION: sb_feat.log_version = - getnum(value, &opts[OPT_L], - L_VERSION); + parse_conf_val(OPT_L, + L_VERSION, + value); lvflag = 1; break; case L_SIZE: - logbytes = getnum(value, - &opts[OPT_L], L_SIZE); + logbytes = parse_conf_val(OPT_L, + L_SIZE, + value); break; case L_SECTLOG: - lsectorlog = getnum(value, - &opts[OPT_L], L_SECTLOG); + lsectorlog = parse_conf_val(OPT_L, + L_SECTLOG, + value); lsectorsize = 1 << lsectorlog; lslflag = 1; break; case L_SECTSIZE: - lsectorsize = getnum(value, - &opts[OPT_L], L_SECTSIZE); + lsectorsize = + parse_conf_val(OPT_L, + L_SECTSIZE, + value); lsectorlog = libxfs_highbit32(lsectorsize); lssflag = 1; break; case L_LAZYSBCNTR: sb_feat.lazy_sb_counters = - getnum(value, &opts[OPT_L], - L_LAZYSBCNTR); + parse_conf_val(OPT_L, + L_LAZYSBCNTR, + value); break; default: unknown('l', value); @@ -2075,29 +2104,33 @@ main( switch (getsubopt(&p, subopts, &value)) { case M_CRC: sb_feat.crcs_enabled = - getnum(value, &opts[OPT_M], - M_CRC); + parse_conf_val(OPT_M, M_CRC, + value); if (sb_feat.crcs_enabled) sb_feat.dirftype = true; break; case M_FINOBT: - sb_feat.finobt = getnum( - value, &opts[OPT_M], M_FINOBT); + sb_feat.finobt = + parse_conf_val(OPT_M, M_FINOBT, + value); break; case M_UUID: if (!value || *value == '\0') reqval('m', subopts, M_UUID); if (platform_uuid_parse(value, &uuid)) illegal(optarg, "m uuid"); + set_conf_val(OPT_M, M_UUID, 1); break; case M_RMAPBT: - sb_feat.rmapbt = getnum( - value, &opts[OPT_M], M_RMAPBT); + sb_feat.rmapbt = + parse_conf_val(OPT_M, M_RMAPBT, + value); break; case M_REFLINK: sb_feat.reflink = - getnum(value, &opts[OPT_M], - M_REFLINK); + parse_conf_val(OPT_M, + M_REFLINK, + value); break; default: unknown('m', value); @@ -2113,14 +2146,16 @@ main( switch (getsubopt(&p, subopts, &value)) { case N_LOG: - dirblocklog = getnum(value, - &opts[OPT_N], N_LOG); + dirblocklog = parse_conf_val(OPT_N, + N_LOG, + value); dirblocksize = 1 << dirblocklog; nlflag = 1; break; case N_SIZE: - dirblocksize = getnum(value, - &opts[OPT_N], N_SIZE); + dirblocksize = parse_conf_val(OPT_N, + N_SIZE, + value); dirblocklog = libxfs_highbit32(dirblocksize); nsflag = 1; @@ -2134,14 +2169,17 @@ main( } else { sb_feat.dir_version = getnum(value, - &opts[OPT_N], - N_VERSION); + &opts[OPT_N], + N_VERSION); } nvflag = 1; + set_conf_val(OPT_N, N_VERSION, + sb_feat.dir_version); break; case N_FTYPE: - sb_feat.dirftype = getnum(value, - &opts[OPT_N], N_FTYPE); + sb_feat.dirftype = + parse_conf_val(OPT_N, N_FTYPE, + value); break; default: unknown('n', value); @@ -2171,25 +2209,30 @@ main( switch (getsubopt(&p, subopts, &value)) { case R_EXTSIZE: - rtextbytes = getnum(value, - &opts[OPT_R], R_EXTSIZE); + rtextbytes = parse_conf_val(OPT_R, + R_EXTSIZE, + value); break; case R_FILE: - xi.risfile = getnum(value, - &opts[OPT_R], R_FILE); + xi.risfile = parse_conf_val(OPT_R, + R_FILE, + value); break; case R_NAME: case R_DEV: xi.rtname = getstr(value, &opts[OPT_R], R_NAME); + set_conf_val(OPT_R, R_NAME, 1); + set_conf_val(OPT_R, R_DEV, 1); break; case R_SIZE: - rtbytes = getnum(value, &opts[OPT_R], - R_SIZE); + rtbytes = parse_conf_val(OPT_R, R_SIZE, + value); break; case R_NOALIGN: - norsflag = getnum(value, &opts[OPT_R], - R_NOALIGN); + norsflag = parse_conf_val(OPT_R, + R_NOALIGN, + value); break; default: unknown('r', value); @@ -2210,8 +2253,9 @@ main( conflict('s', subopts, S_SECTSIZE, S_SECTLOG); - sectorlog = getnum(value, &opts[OPT_S], - S_SECTLOG); + sectorlog = parse_conf_val(OPT_S, + S_SECTLOG, + value); lsectorlog = sectorlog; sectorsize = 1 << sectorlog; lsectorsize = sectorsize; @@ -2223,8 +2267,9 @@ main( conflict('s', subopts, S_SECTLOG, S_SECTSIZE); - sectorsize = getnum(value, - &opts[OPT_S], S_SECTSIZE); + sectorsize = parse_conf_val(OPT_S, + S_SECTSIZE, + value); lsectorsize = sectorsize; sectorlog = libxfs_highbit32(sectorsize);
Save the parsed values from users into the opts table. This will ensure that the user values gets there and are validated, but we are not yet using them for anything - the usage makes a lot of changes through the code, so it is better if that is separated into smaller chunks. Signed-off-by: Jan Tulak <jtulak@redhat.com> --- Edit: * sectorizes fix * remove collateral assignments that are now covered within parse function * remove duplicit assignments into opts within one option * fix issue with proj(16|32)bit * updated description --- mkfs/xfs_mkfs.c | 239 +++++++++++++++++++++++++++++++++----------------------- 1 file changed, 142 insertions(+), 97 deletions(-)