From patchwork Thu Jul 20 09:29:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Tulak X-Patchwork-Id: 9854405 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B3ABD600F5 for ; Thu, 20 Jul 2017 09:29:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A951528749 for ; Thu, 20 Jul 2017 09:29:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9E4252876B; Thu, 20 Jul 2017 09:29:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E07F228749 for ; Thu, 20 Jul 2017 09:29:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935006AbdGTJ3r (ORCPT ); Thu, 20 Jul 2017 05:29:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36256 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935185AbdGTJ3o (ORCPT ); Thu, 20 Jul 2017 05:29:44 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 65E25806B9 for ; Thu, 20 Jul 2017 09:29:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 65E25806B9 Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=jtulak@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 65E25806B9 Received: from honza-mbp.redhat.com (ovpn-204-167.brq.redhat.com [10.40.204.167]) by smtp.corp.redhat.com (Postfix) with ESMTP id A07ED7982A; Thu, 20 Jul 2017 09:29:43 +0000 (UTC) From: Jan Tulak To: linux-xfs@vger.kernel.org Cc: Jan Tulak Subject: [PATCH 7/7] mkfs: save user input values into opts Date: Thu, 20 Jul 2017 11:29:32 +0200 Message-Id: <20170720092932.32580-8-jtulak@redhat.com> In-Reply-To: <20170720092932.32580-1-jtulak@redhat.com> References: <20170720092932.32580-1-jtulak@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 20 Jul 2017 09:29:44 +0000 (UTC) Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- Edit: * updated description --- mkfs/xfs_mkfs.c | 260 +++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 165 insertions(+), 95 deletions(-) diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c index e008b5a4..bf480efe 100644 --- a/mkfs/xfs_mkfs.c +++ b/mkfs/xfs_mkfs.c @@ -1616,16 +1616,19 @@ 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; + set_conf_val(OPT_B, B_SIZE, blocksize); 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; + set_conf_val(OPT_B, B_LOG, blocklog); break; default: unknown('b', value); @@ -1641,76 +1644,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); break; case D_SWIDTH: - dswidth = getnum(value, &opts[OPT_D], - D_SWIDTH); + dswidth = parse_conf_val(OPT_D, + D_SWIDTH, + value); break; case D_SU: - dsu = getnum(value, &opts[OPT_D], - D_SU); + dsu = parse_conf_val(OPT_D, D_SU, + value); break; case D_SW: - dsw = getnum(value, &opts[OPT_D], - D_SW); + dsw = parse_conf_val(OPT_D, D_SW, + value); 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; + set_conf_val(OPT_D, D_SECTSIZE, + sectorsize); 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; + set_conf_val(OPT_D, D_SECTLOG, + sectorlog); 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; @@ -1728,45 +1747,53 @@ 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; + set_conf_val(OPT_I, I_SIZE, isize); 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; + set_conf_val(OPT_I, I_LOG, inodelog); 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); + set_conf_val(OPT_I, I_PROJID32BIT, + sb_feat.projid16bit); 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); @@ -1782,27 +1809,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: @@ -1812,34 +1843,48 @@ 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; + set_conf_val(OPT_L, L_VERSION, + sb_feat.log_version); 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; + set_conf_val(OPT_L, L_SECTSIZE, + lsectorsize); 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; + set_conf_val(OPT_L, L_SECTLOG, + lsectorlog); 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); @@ -1861,29 +1906,35 @@ 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); + set_conf_val(OPT_M, M_FINOBT, + sb_feat.finobt); 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); @@ -1899,17 +1950,23 @@ 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; + set_conf_val(OPT_N, N_SIZE, + dirblocksize); 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; + set_conf_val(OPT_N, N_LOG, + dirblocklog); break; case N_VERSION: value = getstr(value, &opts[OPT_N], @@ -1920,14 +1977,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); @@ -1957,25 +2017,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); @@ -1996,12 +2061,14 @@ 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; lslflag = slflag = 1; + set_conf_val(OPT_S, S_LOG, sectorsize); break; case S_SIZE: case S_SECTSIZE: @@ -2009,13 +2076,16 @@ 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); lsectorlog = sectorlog; lssflag = ssflag = 1; + set_conf_val(OPT_S, + S_SIZE, sectorlog); break; default: unknown('s', value);