From patchwork Thu Jul 20 09:51:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Tulak X-Patchwork-Id: 9854437 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 957A160393 for ; Thu, 20 Jul 2017 09:52:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 85ACA2876B for ; Thu, 20 Jul 2017 09:52:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7AA5228776; Thu, 20 Jul 2017 09:52:13 +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 C6FA52877B for ; Thu, 20 Jul 2017 09:52:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933242AbdGTJwI (ORCPT ); Thu, 20 Jul 2017 05:52:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51462 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934132AbdGTJwF (ORCPT ); Thu, 20 Jul 2017 05:52:05 -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 6189B4A6EF for ; Thu, 20 Jul 2017 09:52:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 6189B4A6EF 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 6189B4A6EF 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 5D6118189A; Thu, 20 Jul 2017 09:52:03 +0000 (UTC) From: Jan Tulak To: linux-xfs@vger.kernel.org Cc: Jan Tulak Subject: [PATCH 2/5] mkfs: replace variables with opts table: -i options Date: Thu, 20 Jul 2017 11:51:53 +0200 Message-Id: <20170720095156.35417-3-jtulak@redhat.com> In-Reply-To: <20170720095156.35417-1-jtulak@redhat.com> References: <20170720095156.35417-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]); Thu, 20 Jul 2017 09:52:05 +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 --- mkfs/xfs_mkfs.c | 102 +++++++++++++++++++++++++++++--------------------------- 1 file changed, 53 insertions(+), 49 deletions(-) diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c index 27043684..8778d27a 100644 --- a/mkfs/xfs_mkfs.c +++ b/mkfs/xfs_mkfs.c @@ -1479,13 +1479,9 @@ main( bool force_overwrite; struct fsxattr fsx; int ilflag; - int imaxpct; int imflag; - int inodelog; - int inopblock; int ipflag; int isflag; - int isize; char *label = NULL; int laflag; int lalign; @@ -1570,8 +1566,7 @@ main( logagno = logblocks = rtblocks = rtextblocks = 0; Nflag = nlflag = nsflag = nvflag = 0; dirblocklog = dirblocksize = 0; - qflag = 0; - imaxpct = inodelog = inopblock = isize = 0; + qflag = false; dfile = logfile = rtfile = NULL; protofile = NULL; rtbytes = rtextbytes = logbytes = 0; @@ -1747,6 +1742,7 @@ main( char **subopts = (char **)opts[OPT_I].subopts; char *value; + uint64_t tmp; switch (getsubopt(&p, subopts, &value)) { case I_ALIGN: @@ -1755,30 +1751,26 @@ main( value); break; case I_LOG: - inodelog = parse_conf_val(OPT_I, I_LOG, - value); - isize = 1 << inodelog; + tmp = parse_conf_val(OPT_I, I_LOG, + value); + set_conf_val(OPT_I, I_SIZE, 1 << tmp); ilflag = 1; - set_conf_val(OPT_I, I_SIZE, isize); break; case I_MAXPCT: - imaxpct = parse_conf_val(OPT_I, - I_MAXPCT, - value); + parse_conf_val(OPT_I, I_MAXPCT, value); imflag = 1; break; case I_PERBLOCK: - inopblock = parse_conf_val(OPT_I, - I_PERBLOCK, - value); + parse_conf_val(OPT_I, I_PERBLOCK, + value); ipflag = 1; break; case I_SIZE: - isize = parse_conf_val(OPT_I, I_SIZE, + tmp = parse_conf_val(OPT_I, I_SIZE, value); - inodelog = libxfs_highbit32(isize); + set_conf_val(OPT_I, I_LOG, + libxfs_highbit32(tmp)); isflag = 1; - set_conf_val(OPT_I, I_LOG, inodelog); break; case I_ATTR: sb_feat.attr_version = @@ -2269,7 +2261,8 @@ _("block size %lld cannot be smaller than logical sector size %d\n"), */ if (sb_feat.crcs_enabled) { /* minimum inode size is 512 bytes, ipflag checked later */ - if ((isflag || ilflag) && inodelog < XFS_DINODE_DFL_CRC_LOG) { + if ((isflag || ilflag) && + get_conf_val(OPT_I, I_LOG) < XFS_DINODE_DFL_CRC_LOG) { fprintf(stderr, _("Minimum inode size for CRCs is %d bytes\n"), 1 << XFS_DINODE_DFL_CRC_LOG); @@ -2393,15 +2386,17 @@ _("rmapbt not supported with realtime devices\n")); get_conf_val(OPT_B, B_LOG))); } if (ipflag) { - inodelog = get_conf_val(OPT_B, B_LOG) - - libxfs_highbit32(inopblock); - isize = 1 << inodelog; + set_conf_val(OPT_I, I_LOG, get_conf_val(OPT_B, B_LOG) - + libxfs_highbit32(get_conf_val(OPT_I, I_PERBLOCK))); + set_conf_val(OPT_I, I_SIZE, 1 << get_conf_val(OPT_I, I_LOG)); } else if (!ilflag && !isflag) { - inodelog = sb_feat.crcs_enabled ? XFS_DINODE_DFL_CRC_LOG - : XFS_DINODE_DFL_LOG; - isize = 1 << inodelog; + set_conf_val(OPT_I, I_LOG, + sb_feat.crcs_enabled ? XFS_DINODE_DFL_CRC_LOG + : XFS_DINODE_DFL_LOG); + set_conf_val(OPT_I, I_SIZE, 1 << get_conf_val(OPT_I, I_LOG)); } - if (sb_feat.crcs_enabled && inodelog < XFS_DINODE_DFL_CRC_LOG) { + if (sb_feat.crcs_enabled && get_conf_val(OPT_I, I_LOG) < + XFS_DINODE_DFL_CRC_LOG) { fprintf(stderr, _("Minimum inode size for CRCs is %d bytes\n"), 1 << XFS_DINODE_DFL_CRC_LOG); @@ -2488,12 +2483,14 @@ _("rmapbt not supported with realtime devices\n")); /* * Check some argument sizes against mins, maxes. */ - if (isize > get_conf_val(OPT_B, B_SIZE) / XFS_MIN_INODE_PERBLOCK || - isize < XFS_DINODE_MIN_SIZE || - isize > XFS_DINODE_MAX_SIZE) { + if (get_conf_val(OPT_I, I_SIZE) > + get_conf_val(OPT_B, B_SIZE) / XFS_MIN_INODE_PERBLOCK || + get_conf_val(OPT_I, I_SIZE) < XFS_DINODE_MIN_SIZE || + get_conf_val(OPT_I, I_SIZE) > XFS_DINODE_MAX_SIZE) { int maxsz; - fprintf(stderr, _("illegal inode size %d\n"), isize); + fprintf(stderr, _("illegal inode size %lld\n"), + get_conf_val(OPT_I, I_SIZE)); maxsz = MIN(get_conf_val(OPT_B, B_SIZE) / XFS_MIN_INODE_PERBLOCK, XFS_DINODE_MAX_SIZE); @@ -2899,8 +2896,9 @@ an AG size that is one stripe unit smaller, for example %llu.\n"), get_conf_val(OPT_D, D_AGCOUNT)); if (!imflag) - imaxpct = calc_default_imaxpct(get_conf_val(OPT_B, B_LOG), - dblocks); + set_conf_val(OPT_I, I_MAXPCT, + calc_default_imaxpct(get_conf_val(OPT_B, B_LOG), + dblocks)); /* * check that log sunit is modulo fsblksize or default it to D_SUNIT. @@ -2933,7 +2931,7 @@ 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), - inodelog, dirblocklog, + get_conf_val(OPT_I, I_LOG), dirblocklog, sb_feat.log_version, lsunit, sb_feat.finobt, sb_feat.rmapbt, sb_feat.reflink, sb_feat.inode_align); @@ -3092,29 +3090,32 @@ _("size %s specified for log subvolume is too large, maximum is %lld blocks\n"), if (!qflag || Nflag) { printf(_( - "meta-data=%-22s isize=%-6d agcount=%lld, agsize=%lld blks\n" + "meta-data=%-22s isize=%-6lld agcount=%lld, agsize=%lld blks\n" " =%-22s sectsz=%-5lld attr=%u, projid32bit=%u\n" " =%-22s crc=%-8u finobt=%u, sparse=%u, rmapbt=%u, reflink=%u\n" - "data =%-22s bsize=%-6lld blocks=%llu, imaxpct=%u\n" - " =%-22s sunit=%-6lld swidth=%lld blks\n" - "naming =version %-14u bsize=%-6u ascii-ci=%d ftype=%d\n" + "data =%-22s bsize=%-6llu blocks=%lld, imaxpct=%lld\n" + " =%-22s sunit=%-6llu swidth=%lld blks\n" + "naming =version %-14u bsize=%-6llu ascii-ci=%d ftype=%d\n" "log =%-22s bsize=%-6d blocks=%lld, version=%d\n" - " =%-22s sectsz=%-5u sunit=%d blks, lazy-count=%d\n" + " =%-22s sectsz=%-5lld sunit=%lld blks, lazy-count=%d\n" "realtime =%-22s extsz=%-6d blocks=%lld, rtextents=%lld\n"), - dfile, isize, get_conf_val(OPT_D, D_AGCOUNT), + dfile, get_conf_val(OPT_I, I_SIZE), + get_conf_val(OPT_D, D_AGCOUNT), get_conf_val(OPT_D, D_AGSIZE), "", get_conf_val(OPT_D, D_SECTSIZE), sb_feat.attr_version, !sb_feat.projid16bit, "", sb_feat.crcs_enabled, sb_feat.finobt, sb_feat.spinodes, sb_feat.rmapbt, sb_feat.reflink, - "", get_conf_val(OPT_B, B_SIZE), (long long)dblocks, imaxpct, + "", get_conf_val(OPT_B, B_SIZE), + (long long)dblocks, + 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, (long long)dirblocksize, sb_feat.nci, sb_feat.dirftype, logfile, 1 << get_conf_val(OPT_B, B_LOG), (long long)logblocks, - sb_feat.log_version, "", lsectorsize, lsunit, + sb_feat.log_version, "", (long long)lsectorsize, (long long)lsunit, sb_feat.lazy_sb_counters, rtfile, rtextblocks << get_conf_val(OPT_B, B_LOG), (long long)rtblocks, (long long)rtextents); @@ -3139,16 +3140,18 @@ _("size %s specified for log subvolume is too large, maximum is %lld blocks\n"), sbp->sb_rbmblocks = nbmblocks; sbp->sb_logblocks = (xfs_extlen_t)logblocks; sbp->sb_sectsize = (__uint16_t)get_conf_val(OPT_D, D_SECTSIZE); - sbp->sb_inodesize = (__uint16_t)isize; - sbp->sb_inopblock = (__uint16_t)(get_conf_val(OPT_B, B_SIZE) / isize); + sbp->sb_inodesize = (__uint16_t)get_conf_val(OPT_I, I_SIZE); + sbp->sb_inopblock = (__uint16_t)(get_conf_val(OPT_B, B_SIZE) / + get_conf_val(OPT_I, I_SIZE)); sbp->sb_sectlog = (__uint8_t)get_conf_val(OPT_D, D_SECTLOG); - sbp->sb_inodelog = (__uint8_t)inodelog; - sbp->sb_inopblog = (__uint8_t)(get_conf_val(OPT_B, B_LOG) - inodelog); + sbp->sb_inodelog = (__uint8_t)get_conf_val(OPT_I, I_LOG); + sbp->sb_inopblog = (__uint8_t)(get_conf_val(OPT_B, B_LOG) - + get_conf_val(OPT_I, I_LOG)); sbp->sb_rextslog = (__uint8_t)(rtextents ? libxfs_highbit32((unsigned int)rtextents) : 0); sbp->sb_inprogress = 1; /* mkfs is in progress */ - sbp->sb_imax_pct = imaxpct; + sbp->sb_imax_pct = get_conf_val(OPT_I, I_MAXPCT); sbp->sb_icount = 0; sbp->sb_ifree = 0; sbp->sb_fdblocks = dblocks - @@ -3168,7 +3171,8 @@ _("size %s specified for log subvolume is too large, maximum is %lld blocks\n"), if (sb_feat.inode_align) { int cluster_size = XFS_INODE_BIG_CLUSTER_SIZE; if (sb_feat.crcs_enabled) - cluster_size *= isize / XFS_DINODE_MIN_SIZE; + cluster_size *= get_conf_val(OPT_I, I_SIZE) / + XFS_DINODE_MIN_SIZE; sbp->sb_inoalignmt = cluster_size >> get_conf_val(OPT_B, B_LOG); sb_feat.inode_align = sbp->sb_inoalignmt != 0; } else