From patchwork Fri Aug 11 12:30:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Tulak X-Patchwork-Id: 9895695 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 BAEE9603B4 for ; Fri, 11 Aug 2017 12:31:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AC7BE28B85 for ; Fri, 11 Aug 2017 12:31:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A160F28B91; Fri, 11 Aug 2017 12:31:06 +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 E974328B8C for ; Fri, 11 Aug 2017 12:31:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752864AbdHKMbF (ORCPT ); Fri, 11 Aug 2017 08:31:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56872 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752765AbdHKMbE (ORCPT ); Fri, 11 Aug 2017 08:31:04 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C93A86B241 for ; Fri, 11 Aug 2017 12:31:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com C93A86B241 Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=jtulak@redhat.com Received: from jtulak-arch.redhat.com (unknown [10.43.17.156]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2602960C25; Fri, 11 Aug 2017 12:31:03 +0000 (UTC) From: Jan Tulak To: linux-xfs@vger.kernel.org Cc: Jan Tulak Subject: [PATCH 5/6] mkfs: replace variables with opts table: -n options Date: Fri, 11 Aug 2017 14:30:57 +0200 Message-Id: <20170811123058.16061-6-jtulak@redhat.com> In-Reply-To: <20170811123058.16061-1-jtulak@redhat.com> References: <20170811123058.16061-1-jtulak@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Fri, 11 Aug 2017 12:31:04 +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, accessible from anywhere. In future, we can remove some instances where we are passing values as arguments to helper functions, when we have the values in the opts struct and could pass only the struct. But for now, limit the changes to simple replacement without any change in the logic. Signed-off-by: Jan Tulak Reviewed-by: Darrick J. Wong --- mkfs/xfs_mkfs.c | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c index 4e85694f..51c1a794 100644 --- a/mkfs/xfs_mkfs.c +++ b/mkfs/xfs_mkfs.c @@ -1685,8 +1685,6 @@ main( int dasize; xfs_rfsblock_t dblocks; char *dfile; - int dirblocklog; - int dirblocksize; int dsflag; bool force_overwrite; struct fsxattr fsx; @@ -1767,7 +1765,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; @@ -2082,18 +2079,15 @@ main( switch (getsubopt(&p, subopts, &value)) { case N_LOG: - dirblocklog = parse_conf_val(OPT_N, + parse_conf_val(OPT_N, N_LOG, value); - dirblocksize = 1 << dirblocklog; nlflag = 1; break; case N_SIZE: - dirblocksize = parse_conf_val(OPT_N, + parse_conf_val(OPT_N, N_SIZE, value); - dirblocklog = - libxfs_highbit32(dirblocksize); nsflag = 1; break; case N_VERSION: @@ -2458,18 +2452,19 @@ _("rmapbt not supported with realtime devices\n")); } if (nsflag || nlflag) { - if (dirblocksize < get_conf_val(OPT_B, B_SIZE) || - dirblocksize > XFS_MAX_BLOCKSIZE) { - fprintf(stderr, _("illegal directory block size %d\n"), - dirblocksize); + 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 %lld\n"), + 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)); } @@ -3053,7 +3048,8 @@ an AG size that is one stripe unit smaller, for example %llu.\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, @@ -3244,7 +3240,8 @@ _("size %s specified for log subvolume is too large, maximum is %lld blocks\n"), 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, (long long)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), (long long)logblocks, sb_feat.log_version, "", @@ -3296,7 +3293,8 @@ _("size %s specified for log subvolume is too large, maximum is %lld blocks\n"), 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) ?