From patchwork Thu May 17 19:26:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 10407629 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 8C88E60230 for ; Thu, 17 May 2018 19:27:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7B6782862C for ; Thu, 17 May 2018 19:27:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6F8D22868C; Thu, 17 May 2018 19:27: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=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID 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 F32902862C for ; Thu, 17 May 2018 19:27:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751233AbeEQT1E (ORCPT ); Thu, 17 May 2018 15:27:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:41566 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751231AbeEQT1D (ORCPT ); Thu, 17 May 2018 15:27:03 -0400 Received: from garbanzo.do-not-panic.com (c-73-15-241-2.hsd1.ca.comcast.net [73.15.241.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DB73720850; Thu, 17 May 2018 19:27:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1526585223; bh=lEwE3vu3cAmAvOdOc9MlQU9P9Kovw3uKNCgFnjStUqc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n/RQkW2wWgxaMkuN0cG/UGJKu45LXCzdkCEiUarp87+EMM79JyqFcjswAqIvBin0/ zUOqIhAelwl2VTkNDpV/TpySIns0pwj6uzPkQ9WaVgahIiAE1yl3oASgs/kVAsTZ1Q 0qFwQVgqJUh7X6z8GVN2ZyLIDZszfW3dewmgonRA= From: "Luis R. Rodriguez" To: sandeen@sandeen.net, linux-xfs@vger.kernel.org Cc: darrick.wong@oracle.com, jack@suse.com, jeffm@suse.com, okurz@suse.com, lpechacek@suse.com, jtulak@redhat.com, "Luis R. Rodriguez" Subject: [PATCH v2 1/5] mkfs: distinguish between struct sb_feat_args and struct cli_params Date: Thu, 17 May 2018 12:26:56 -0700 Message-Id: <20180517192700.23457-2-mcgrof@kernel.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180517192700.23457-1-mcgrof@kernel.org> References: <20180517192700.23457-1-mcgrof@kernel.org> 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 The struct sb_feat_args will actually be shared between the code which processes command line options and the configuration file, as such we need to clarify and reflect this clearly in documentation. Signed-off-by: Luis R. Rodriguez Reviewed-by: Dave Chinner --- mkfs/xfs_mkfs.c | 45 ++++++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c index 3804814b3b8a..95cd6ced13f0 100644 --- a/mkfs/xfs_mkfs.c +++ b/mkfs/xfs_mkfs.c @@ -707,26 +707,18 @@ cli_opt_set( } /* - * Options configured on the command line. - * - * This stores all the specific config parameters the user sets on the command - * line. We do not use these values directly - they are inputs to the mkfs - * geometry validation and override any default configuration value we have. + * Shared superblock configuration options * - * We don't keep flags to indicate what parameters are set - if we need to check - * if an option was set on the command line, we check the relevant entry in the - * option table which records whether it was specified in the .seen and - * .str_seen variables in the table. + * These options provide shared configuration tunables for the filesystem + * superblock. There are three possible sources for these options set, each + * source can overriding the later source: * - * Some parameters are stored as strings for post-parsing after their dependent - * options have been resolved (e.g. block size and sector size have been parsed - * and validated). + * o built-in defaults + * o configuration file (XXX) + * o command line * - * This allows us to check that values have been set without needing separate - * flags for each value, and hence avoids needing to record and check for each - * specific option that can set the value later on in the code. In the cases - * where we don't have a cli_params structure around, the above cli_opt_set() - * function can be used. + * These values are not used directly - they are inputs into the mkfs geometry + * validation. */ struct sb_feat_args { int log_version; @@ -747,6 +739,25 @@ struct sb_feat_args { bool nortalign; }; +/* + * Options configured on the command line. + * + * This stores all the specific config parameters the user sets on the command + * line. We don't keep flags to indicate what parameters are set - if we need + * to check if an option was set on the command line, we check the relevant + * entry in the option table which records whether it was specified in the + * .seen and .str_seen variables in the table. + * + * Some parameters are stored as strings for post-parsing after their dependent + * options have been resolved (e.g. block size and sector size have been parsed + * and validated). + * + * This allows us to check that values have been set without needing separate + * flags for each value, and hence avoids needing to record and check for each + * specific option that can set the value later on in the code. In the cases + * where we don't have a cli_params structure around, the function cli_opt_set() + * function can be used. + */ struct cli_params { int sectorsize; int blocksize;