From patchwork Wed Dec 7 13:27:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Tulak X-Patchwork-Id: 9486727 X-Mozilla-Keys: nonjunk Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on sandeen.net X-Spam-Level: X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD autolearn=ham autolearn_force=no version=3.4.0 X-Spam-HP: BAYES_00=-1.9,HEADER_FROM_DIFFERENT_DOMAINS=0.001, RCVD_IN_DNSWL_HI=-5,RP_MATCHES_RCVD=-0.1 X-Original-To: sandeen@sandeen.net Delivered-To: sandeen@sandeen.net Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by sandeen.net (Postfix) with ESMTP id 21F4C4796AB for ; Wed, 7 Dec 2016 07:35:44 -0600 (CST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753035AbcLGNgn (ORCPT ); Wed, 7 Dec 2016 08:36:43 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40792 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752563AbcLGNgn (ORCPT ); Wed, 7 Dec 2016 08:36:43 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 148BEC01BB21 for ; Wed, 7 Dec 2016 13:27:50 +0000 (UTC) Received: from localhost.localdomain (vpn1-6-116.ams2.redhat.com [10.36.6.116]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id uB7DRdnv022223; Wed, 7 Dec 2016 08:27:49 -0500 From: Jan Tulak To: linux-xfs@vger.kernel.org Cc: Jan Tulak Subject: [PATCH 09/22] mkfs: change conflict checks to utilize the new conflict structure Date: Wed, 7 Dec 2016 14:27:16 +0100 Message-Id: <1481117249-21273-10-git-send-email-jtulak@redhat.com> In-Reply-To: <1481117249-21273-1-git-send-email-jtulak@redhat.com> References: <1481117249-21273-1-git-send-email-jtulak@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 07 Dec 2016 13:27:50 +0000 (UTC) Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org Bring the conflicts detection up to date with conflicts declaration. Signed-off-by: Jan Tulak --- mkfs/xfs_mkfs.c | 37 +++++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c index 30618ff..d11fad6 100644 --- a/mkfs/xfs_mkfs.c +++ b/mkfs/xfs_mkfs.c @@ -1372,7 +1372,7 @@ illegal_option( * Check for conflicts and option respecification. */ static void -check_opt( +check_subopt_conflicts( struct opt_params *opt, int index, bool str_seen) @@ -1424,7 +1424,7 @@ check_opt( * Check for conflict values between options. */ static void -check_opt_value( +check_subopt_value( struct opt_params *opt, int index, long long value) @@ -1450,6 +1450,32 @@ check_opt_value( } } +/** + * Go through entire opt_params table and check every option for valid values + * and for conflicts. + */ +static void +check_opt( + struct opt_params *opts, + int opti) +{ + int index; + struct opt_params *opt = &opts[opti]; + for (index = 0; index < MAX_SUBOPTS; index++) { + struct subopt_param *sp = &opt->subopt_params[index]; + check_subopt_conflicts(opt, index, false); + check_subopt_value(opt, index, sp->value); + } +} +static void +check_all_opts(struct opt_params *opts) +{ + int opti; + for (opti = 0; opti < MAX_OPTS; opti++) { + check_opt(opts, opti); + } +} + static long long getnum( const char *str, @@ -1459,7 +1485,6 @@ getnum( struct subopt_param *sp = &opts->subopt_params[index]; long long c; - check_opt(opts, index, false); /* empty strings might just return a default value */ if (!str || *str == '\0') { if (sp->defaultval == SUBOPT_NEEDS_VAL) @@ -1493,8 +1518,6 @@ getnum( illegal_option(str, opts, index, NULL); } - check_opt_value(opts, index, c); - /* Validity check the result. */ if (c < sp->minval) illegal_option(str, opts, index, _("value is too small")); @@ -1517,7 +1540,7 @@ getstr( struct opt_params *opts, int index) { - check_opt(opts, index, true); + check_subopt(opts, index, true); /* empty strings for string options are not valid */ if (!str || *str == '\0') @@ -2213,6 +2236,8 @@ main( } else dfile = xi.dname; + check_all_opts(opts); + /* * Blocksize and sectorsize first, other things depend on them * For RAID4/5/6 we want to align sector size and block size,