From patchwork Fri Aug 11 12:30:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Tulak X-Patchwork-Id: 9895697 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 97F0E60236 for ; Fri, 11 Aug 2017 12:31:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8991128B85 for ; Fri, 11 Aug 2017 12:31:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7E6F728B91; Fri, 11 Aug 2017 12:31:07 +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 E9F1E28B85 for ; Fri, 11 Aug 2017 12:31:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752871AbdHKMbG (ORCPT ); Fri, 11 Aug 2017 08:31:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33482 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752765AbdHKMbG (ORCPT ); Fri, 11 Aug 2017 08:31:06 -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 DC57A5245 for ; Fri, 11 Aug 2017 12:31:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com DC57A5245 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.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 1BF0817C70; Fri, 11 Aug 2017 12:31:04 +0000 (UTC) From: Jan Tulak To: linux-xfs@vger.kernel.org Cc: Jan Tulak Subject: [PATCH 6/6] mkfs: replace variables with opts table: -r options Date: Fri, 11 Aug 2017 14:30:58 +0200 Message-Id: <20170811123058.16061-7-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.27]); Fri, 11 Aug 2017 12:31:06 +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 | 71 ++++++++++++++++++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 34 deletions(-) diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c index 51c1a794..aeb62589 100644 --- a/mkfs/xfs_mkfs.c +++ b/mkfs/xfs_mkfs.c @@ -1711,7 +1711,6 @@ main( xfs_mount_t mbuf; xfs_extlen_t nbmblocks; int nlflag; - int norsflag; xfs_alloc_rec_t *nrec; int nsflag; int nvflag; @@ -1722,10 +1721,8 @@ main( char *protostring; int qflag; xfs_rfsblock_t rtblocks; - uint64_t rtbytes; xfs_extlen_t rtextblocks; xfs_rtblock_t rtextents; - uint64_t rtextbytes; char *rtfile; xfs_sb_t *sbp; uint64_t sector_mask; @@ -1768,9 +1765,8 @@ main( qflag = false; dfile = logfile = rtfile = NULL; protofile = NULL; - rtbytes = rtextbytes = 0; lalign = 0; - dsflag = norsflag = false; + dsflag = false; force_overwrite = false; worst_freelist = 0; memset(&fsx, 0, sizeof(fsx)); @@ -2139,9 +2135,8 @@ main( switch (getsubopt(&p, subopts, &value)) { case R_EXTSIZE: - rtextbytes = parse_conf_val(OPT_R, - R_EXTSIZE, - value); + parse_conf_val(OPT_R, R_EXTSIZE, + value); break; case R_FILE: xi.risfile = parse_conf_val(OPT_R, @@ -2156,13 +2151,11 @@ main( set_conf_val(OPT_R, R_DEV, 1); break; case R_SIZE: - rtbytes = parse_conf_val(OPT_R, R_SIZE, - value); + parse_conf_val(OPT_R, R_SIZE, value); break; case R_NOALIGN: - norsflag = parse_conf_val(OPT_R, - R_NOALIGN, - value); + parse_conf_val(OPT_R, R_NOALIGN, + value); break; default: unknown('r', value); @@ -2271,7 +2264,10 @@ _("Minimum block size for CRC enabled filesystems is %d bytes.\n"), !xi.logname, Nflag ? NULL : &xi.lcreat, force_overwrite, "l"); if (xi.rtname) - check_device_type(xi.rtname, &xi.risfile, !rtbytes, !xi.rtname, + check_device_type(xi.rtname, + &xi.risfile, + !get_conf_val(OPT_R, R_SIZE), + !xi.rtname, Nflag ? NULL : &xi.rcreat, force_overwrite, "r"); if (xi.disfile || xi.lisfile || xi.risfile) @@ -2520,33 +2516,36 @@ _("rmapbt not supported with realtime devices\n")); (long long)(logblocks << get_conf_val(OPT_B, B_LOG))); } - if (rtbytes) { - if (rtbytes % XFS_MIN_BLOCKSIZE) { + if (get_conf_val(OPT_R, R_SIZE)) { + if (get_conf_val(OPT_R, R_SIZE) % XFS_MIN_BLOCKSIZE) { fprintf(stderr, _("illegal rt length %lld, not a multiple of %d\n"), - (long long)rtbytes, XFS_MIN_BLOCKSIZE); + get_conf_val(OPT_R, R_SIZE), XFS_MIN_BLOCKSIZE); usage(); } - rtblocks = (xfs_rfsblock_t)(rtbytes >> + rtblocks = (xfs_rfsblock_t)(get_conf_val(OPT_R, R_SIZE) >> get_conf_val(OPT_B, B_LOG)); - if (rtbytes % get_conf_val(OPT_B, B_SIZE)) + if (get_conf_val(OPT_R, R_SIZE) % get_conf_val(OPT_B, B_SIZE)) fprintf(stderr, _("warning: rt length %lld not a multiple of %lld, truncated to %lld\n"), - (long long)rtbytes, get_conf_val(OPT_B, B_SIZE), + get_conf_val(OPT_R, R_SIZE), + get_conf_val(OPT_B, B_SIZE), (long long)(rtblocks << get_conf_val(OPT_B, B_LOG))); } /* * If specified, check rt extent size against its constraints. */ - if (rtextbytes) { - if (rtextbytes % get_conf_val(OPT_B, B_SIZE)) { + if (get_conf_val(OPT_R, R_EXTSIZE)) { + if (get_conf_val(OPT_R, R_EXTSIZE) % + get_conf_val(OPT_B, B_SIZE)) { fprintf(stderr, _("illegal rt extent size %lld, not a multiple of %lld\n"), - (long long)rtextbytes, get_conf_val(OPT_B, B_SIZE)); + get_conf_val(OPT_R, R_EXTSIZE), + get_conf_val(OPT_B, B_SIZE)); usage(); } - rtextblocks = (xfs_extlen_t)(rtextbytes >> + rtextblocks = (xfs_extlen_t)(get_conf_val(OPT_R, R_EXTSIZE) >> get_conf_val(OPT_B, B_LOG)); } else { /* @@ -2555,20 +2554,23 @@ _("rmapbt not supported with realtime devices\n")); * to the stripe width. */ uint64_t rswidth; - uint64_t rtextbytes; - if (!norsflag && !xi.risfile && !(!rtbytes && xi.disfile)) + if (!get_conf_val(OPT_R, R_NOALIGN) && !xi.risfile && + !(!get_conf_val(OPT_R, R_SIZE) && xi.disfile)) rswidth = ft.rtswidth; else rswidth = 0; /* check that rswidth is a multiple of fs B_SIZE */ - if (!norsflag && rswidth && + if (!get_conf_val(OPT_R, R_NOALIGN) && rswidth && !(BBTOB(rswidth) % get_conf_val(OPT_B, B_SIZE))) { rswidth = DTOBT(rswidth); - rtextbytes = rswidth << get_conf_val(OPT_B, B_LOG); - if (XFS_MIN_RTEXTSIZE <= rtextbytes && - (rtextbytes <= XFS_MAX_RTEXTSIZE)) { + set_conf_val(OPT_R, R_EXTSIZE, + rswidth << get_conf_val(OPT_B, B_LOG)); + if (XFS_MIN_RTEXTSIZE <= + get_conf_val(OPT_R, R_EXTSIZE) && + (get_conf_val(OPT_R, R_EXTSIZE) <= + XFS_MAX_RTEXTSIZE)) { rtextblocks = rswidth; } } @@ -2741,7 +2743,7 @@ reported by the device (%u).\n"), reported by the device (%u).\n"), get_conf_val(OPT_L, L_SECTSIZE), xi.lbsize); } - if (rtbytes && xi.rtsize > 0 && + if (get_conf_val(OPT_R, R_SIZE) && xi.rtsize > 0 && xi.rtbsize > get_conf_val(OPT_D, D_SECTSIZE)) { fprintf(stderr, _( "Warning: the realtime subvolume sector size %lld is less than the sector size\n\ @@ -2749,16 +2751,17 @@ reported by the device (%u).\n"), get_conf_val(OPT_D, D_SECTSIZE), xi.rtbsize); } - if (rtbytes && xi.rtsize > 0 && rtblocks > DTOBT(xi.rtsize)) { + if (get_conf_val(OPT_R, R_SIZE) && xi.rtsize > 0 && + rtblocks > DTOBT(xi.rtsize)) { fprintf(stderr, _("size %s specified for rt subvolume is too large, " "maximum is %lld blocks\n"), get_conf_raw_safe(OPT_R, R_SIZE), (long long)DTOBT(xi.rtsize)); usage(); - } else if (!rtbytes && xi.rtsize > 0) + } else if (!get_conf_val(OPT_R, R_SIZE) && xi.rtsize > 0) rtblocks = DTOBT(xi.rtsize); - else if (rtbytes && !xi.rtdev) { + else if (get_conf_val(OPT_R, R_SIZE) && !xi.rtdev) { fprintf(stderr, _("size specified for non-existent rt subvolume\n")); usage();