From patchwork Sun Apr 23 18:55:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Tulak X-Patchwork-Id: 9695245 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 7A37360389 for ; Sun, 23 Apr 2017 18:55:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6F01626490 for ; Sun, 23 Apr 2017 18:55:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 64212265B9; Sun, 23 Apr 2017 18:55:23 +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 0587626490 for ; Sun, 23 Apr 2017 18:55:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1163244AbdDWSzV (ORCPT ); Sun, 23 Apr 2017 14:55:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58732 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1163251AbdDWSzU (ORCPT ); Sun, 23 Apr 2017 14:55:20 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 298EA64DA8 for ; Sun, 23 Apr 2017 18:55:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 298EA64DA8 Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=jtulak@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 298EA64DA8 Received: from honza-mbp.redhat.com (ovpn-204-62.brq.redhat.com [10.40.204.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id 69E5B1F8; Sun, 23 Apr 2017 18:55:19 +0000 (UTC) From: Jan Tulak To: linux-xfs@vger.kernel.org Cc: Jan Tulak Subject: [PATCH 11/12] mkfs: replace variables with opts table: -n options Date: Sun, 23 Apr 2017 20:55:02 +0200 Message-Id: <20170423185503.31415-12-jtulak@redhat.com> In-Reply-To: <20170423185503.31415-1-jtulak@redhat.com> References: <20170423185503.31415-1-jtulak@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Sun, 23 Apr 2017 18:55:20 +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 Remove variables that can be replaced with a direct access to the opts table, so we have it all in a single place, acessible from anywhere. Signed-off-by: Jan Tulak --- mkfs/xfs_mkfs.c | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c index 7d85471..52591b9 100644 --- a/mkfs/xfs_mkfs.c +++ b/mkfs/xfs_mkfs.c @@ -1496,8 +1496,6 @@ main( uint64_t dasize; xfs_rfsblock_t dblocks; char *dfile; - uint64_t dirblocklog; - uint64_t dirblocksize; bool force_overwrite; struct fsxattr fsx; bool ilflag; @@ -1577,7 +1575,6 @@ main( liflag = laflag = lsflag = lsuflag = lsunitflag = ldflag = lvflag = false; logblocks = rtblocks = rtextblocks = 0; Nflag = nlflag = nsflag = nvflag = false; - dirblocklog = dirblocksize = 0; qflag = false; dfile = logfile = rtfile = NULL; protofile = NULL; @@ -1943,26 +1940,23 @@ main( char **subopts = (char **)opts[OPT_N].subopts; char *value; + uint64_t tmp; switch (getsubopt(&p, subopts, &value)) { case N_LOG: - dirblocklog = parse_conf_val(OPT_N, + tmp = parse_conf_val(OPT_N, N_LOG, value); - dirblocksize = 1 << dirblocklog; + set_conf_val(OPT_N, N_SIZE, 1 << tmp); nlflag = 1; - set_conf_val(OPT_N, N_SIZE, - dirblocksize); break; case N_SIZE: - dirblocksize = parse_conf_val(OPT_N, + tmp = parse_conf_val(OPT_N, N_SIZE, value); - dirblocklog = - libxfs_highbit32(dirblocksize); - nsflag = 1; set_conf_val(OPT_N, N_LOG, - dirblocklog); + libxfs_highbit32(tmp)); + nsflag = 1; break; case N_VERSION: value = getstr(value, &opts[OPT_N], @@ -2360,18 +2354,19 @@ _("rmapbt not supported with realtime devices\n")); } if (nsflag || nlflag) { - if (dirblocksize < get_conf_val(OPT_B, B_SIZE) || - dirblocksize > XFS_MAX_BLOCKSIZE) { + if (get_conf_val(OPT_N, N_SIZE) < + get_conf_val(OPT_B, B_SIZE) || + get_conf_val(OPT_N, N_SIZE) > XFS_MAX_BLOCKSIZE) { fprintf(stderr, _("illegal directory block size %"PRIu64"\n"), - dirblocksize); + get_conf_val(OPT_N, N_SIZE)); usage(); } } else { if (get_conf_val(OPT_B, B_SIZE) < (1 << XFS_MIN_REC_DIRSIZE)) - dirblocklog = XFS_MIN_REC_DIRSIZE; + set_conf_val(OPT_N, N_LOG, XFS_MIN_REC_DIRSIZE); else - dirblocklog = get_conf_val(OPT_B, B_LOG); - dirblocksize = 1 << dirblocklog; + set_conf_val(OPT_N, N_LOG, get_conf_val(OPT_B, B_LOG)); + set_conf_val(OPT_N, N_SIZE, 1 << get_conf_val(OPT_N, N_LOG)); } @@ -2949,7 +2944,8 @@ an AG size that is one stripe unit smaller, for example %"PRIu64".\n"), sb_feat.crcs_enabled, sb_feat.dir_version, get_conf_val(OPT_D, D_SECTLOG), get_conf_val(OPT_B, B_LOG), - get_conf_val(OPT_I, I_LOG), dirblocklog, + get_conf_val(OPT_I, I_LOG), + get_conf_val(OPT_N, N_LOG), sb_feat.log_version, get_conf_val(OPT_L, L_SUNIT), sb_feat.finobt, @@ -3139,7 +3135,8 @@ _("size %s specified for log subvolume is too large, maximum is %"PRIu64" blocks get_conf_val(OPT_I, I_MAXPCT), "", get_conf_val(OPT_D, D_SUNIT), get_conf_val(OPT_D, D_SWIDTH), - sb_feat.dir_version, dirblocksize, sb_feat.nci, + sb_feat.dir_version, + get_conf_val(OPT_N, N_SIZE), sb_feat.nci, sb_feat.dirftype, logfile, 1 << get_conf_val(OPT_B, B_LOG), logblocks, sb_feat.log_version, "", @@ -3191,7 +3188,8 @@ _("size %s specified for log subvolume is too large, maximum is %"PRIu64" blocks sbp->sb_qflags = 0; sbp->sb_unit = get_conf_val(OPT_D, D_SUNIT); sbp->sb_width = get_conf_val(OPT_D, D_SWIDTH); - sbp->sb_dirblklog = dirblocklog - get_conf_val(OPT_B, B_LOG); + sbp->sb_dirblklog = get_conf_val(OPT_N, N_LOG) - + get_conf_val(OPT_B, B_LOG); if (sb_feat.log_version == 2) { /* This is stored in bytes */ set_conf_val(OPT_L, L_SUNIT, (get_conf_val(OPT_L, L_SUNIT) == 0) ?