From patchwork Wed Mar 15 16:00:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Tulak X-Patchwork-Id: 9626033 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 1C3AF604CC for ; Wed, 15 Mar 2017 16:01:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0CBBE285ED for ; Wed, 15 Mar 2017 16:01:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F40B128646; Wed, 15 Mar 2017 16:01:50 +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 7D4F5285ED for ; Wed, 15 Mar 2017 16:01:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754080AbdCOQBh (ORCPT ); Wed, 15 Mar 2017 12:01:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50780 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754022AbdCOQAx (ORCPT ); Wed, 15 Mar 2017 12:00:53 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (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 AC593804EB for ; Wed, 15 Mar 2017 16:00:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com AC593804EB 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=pass smtp.mailfrom=jtulak@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com AC593804EB Received: from honza-mbp.redhat.com (ovpn-204-198.brq.redhat.com [10.40.204.198]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v2FG0b8X031509; Wed, 15 Mar 2017 12:00:52 -0400 From: Jan Tulak To: linux-xfs@vger.kernel.org Cc: Jan Tulak Subject: [PATCH 13/22] mkfs: remove zeroed items from conflicts declaration Date: Wed, 15 Mar 2017 17:00:08 +0100 Message-Id: <20170315160017.27805-14-jtulak@redhat.com> In-Reply-To: <20170315160017.27805-1-jtulak@redhat.com> References: <20170315160017.27805-1-jtulak@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Wed, 15 Mar 2017 16:00:53 +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 opts is a global array of structs, so it is already zeroed. No need for explicit zeros on items unless we want to highlight the value. Signed-off-by: Jan Tulak --- mkfs/xfs_mkfs.c | 200 -------------------------------------------------------- 1 file changed, 200 deletions(-) diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c index 3ba71cdc..a604c801 100644 --- a/mkfs/xfs_mkfs.c +++ b/mkfs/xfs_mkfs.c @@ -239,10 +239,6 @@ struct opt_params { { .index = B_LOG, .conflicts = { {.opt = OPT_B, .subopt = B_SIZE, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {LAST_CONFLICT} }, .minval = XFS_MIN_BLOCKSIZE_LOG, @@ -254,10 +250,6 @@ struct opt_params { .is_power_2 = true, .conflicts = { {.opt = OPT_B, .subopt = B_LOG, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {LAST_CONFLICT} }, .minval = XFS_MIN_BLOCKSIZE, @@ -291,10 +283,6 @@ struct opt_params { { .index = D_AGCOUNT, .conflicts = { {.opt = OPT_D, .subopt = D_AGSIZE, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {LAST_CONFLICT} }, .minval = 1, @@ -321,24 +309,12 @@ struct opt_params { { .index = D_SUNIT, .conflicts = { {.opt = OPT_D, .subopt = D_NOALIGN, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {.opt = OPT_D, .subopt = D_SU, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {.opt = OPT_D, .subopt = D_SW, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {LAST_CONFLICT} }, .minval = 0, @@ -348,24 +324,12 @@ struct opt_params { { .index = D_SWIDTH, .conflicts = { {.opt = OPT_D, .subopt = D_NOALIGN, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {.opt = OPT_D, .subopt = D_SU, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {.opt = OPT_D, .subopt = D_SW, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {LAST_CONFLICT} }, .minval = 0, @@ -375,10 +339,6 @@ struct opt_params { { .index = D_AGSIZE, .conflicts = { {.opt = OPT_D, .subopt = D_AGCOUNT, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {LAST_CONFLICT} }, .convert = true, @@ -389,24 +349,12 @@ struct opt_params { { .index = D_SU, .conflicts = { {.opt = OPT_D, .subopt = D_NOALIGN, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {.opt = OPT_D, .subopt = D_SUNIT, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {.opt = OPT_D, .subopt = D_SWIDTH, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {LAST_CONFLICT} }, .convert = true, @@ -417,24 +365,12 @@ struct opt_params { { .index = D_SW, .conflicts = { {.opt = OPT_D, .subopt = D_NOALIGN, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {.opt = OPT_D, .subopt = D_SUNIT, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {.opt = OPT_D, .subopt = D_SWIDTH, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {LAST_CONFLICT} }, .minval = 0, @@ -444,10 +380,6 @@ struct opt_params { { .index = D_SECTLOG, .conflicts = { {.opt = OPT_D, .subopt = D_SECTSIZE, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {LAST_CONFLICT} }, .minval = XFS_MIN_SECTORSIZE_LOG, @@ -457,10 +389,6 @@ struct opt_params { { .index = D_SECTSIZE, .conflicts = { {.opt = OPT_D, .subopt = D_SECTLOG, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {LAST_CONFLICT} }, .convert = true, @@ -472,31 +400,15 @@ struct opt_params { { .index = D_NOALIGN, .conflicts = { {.opt = OPT_D, .subopt = D_SU, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {.opt = OPT_D, .subopt = D_SW, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {.opt = OPT_D, .subopt = D_SUNIT, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {.opt = OPT_D, .subopt = D_SWIDTH, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {LAST_CONFLICT} }, .minval = 0, @@ -555,17 +467,9 @@ struct opt_params { { .index = I_LOG, .conflicts = { {.opt = OPT_I, .subopt = I_PERBLOCK, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {.opt = OPT_I, .subopt = I_SIZE, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {LAST_CONFLICT} }, .minval = XFS_DINODE_MIN_LOG, @@ -581,17 +485,9 @@ struct opt_params { { .index = I_PERBLOCK, .conflicts = { {.opt = OPT_I, .subopt = I_LOG, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {.opt = OPT_I, .subopt = I_SIZE, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {LAST_CONFLICT} }, .is_power_2 = true, @@ -602,17 +498,9 @@ struct opt_params { { .index = I_SIZE, .conflicts = { {.opt = OPT_I, .subopt = I_PERBLOCK, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {.opt = OPT_I, .subopt = I_LOG, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {LAST_CONFLICT} }, .is_power_2 = true, @@ -687,10 +575,6 @@ struct opt_params { { .index = L_AGNUM, .conflicts = { {.opt = OPT_L, .subopt = L_DEV, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {LAST_CONFLICT} }, .minval = 0, @@ -700,17 +584,9 @@ struct opt_params { { .index = L_INTERNAL, .conflicts = { {.opt = OPT_L, .subopt = L_FILE, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {.opt = OPT_L, .subopt = L_DEV, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {LAST_CONFLICT} }, .minval = 0, @@ -741,10 +617,6 @@ struct opt_params { { .index = L_SUNIT, .conflicts = { {.opt = OPT_L, .subopt = L_SU, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {LAST_CONFLICT} }, .minval = 1, @@ -754,10 +626,6 @@ struct opt_params { { .index = L_SU, .conflicts = { {.opt = OPT_L, .subopt = L_SUNIT, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {LAST_CONFLICT} }, .convert = true, @@ -768,17 +636,9 @@ struct opt_params { { .index = L_DEV, .conflicts = { {.opt = OPT_L, .subopt = L_AGNUM, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {.opt = OPT_L, .subopt = L_INTERNAL, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {LAST_CONFLICT} }, .defaultval = SUBOPT_NEEDS_VAL, @@ -786,10 +646,6 @@ struct opt_params { { .index = L_SECTLOG, .conflicts = { {.opt = OPT_L, .subopt = L_SECTSIZE, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {LAST_CONFLICT} }, .minval = XFS_MIN_SECTORSIZE_LOG, @@ -799,10 +655,6 @@ struct opt_params { { .index = L_SECTSIZE, .conflicts = { {.opt = OPT_L, .subopt = L_SECTLOG, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {LAST_CONFLICT} }, .convert = true, @@ -814,10 +666,6 @@ struct opt_params { { .index = L_FILE, .conflicts = { {.opt = OPT_L, .subopt = L_INTERNAL, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {LAST_CONFLICT} }, .minval = 0, @@ -827,17 +675,9 @@ struct opt_params { { .index = L_NAME, .conflicts = { {.opt = OPT_L, .subopt = L_AGNUM, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {.opt = OPT_L, .subopt = L_INTERNAL, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {LAST_CONFLICT} }, .defaultval = SUBOPT_NEEDS_VAL, @@ -872,10 +712,6 @@ struct opt_params { { .index = N_LOG, .conflicts = { {.opt = OPT_N, .subopt = N_SIZE, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {LAST_CONFLICT} }, .minval = XFS_MIN_REC_DIRSIZE, @@ -885,10 +721,6 @@ struct opt_params { { .index = N_SIZE, .conflicts = { {.opt = OPT_N, .subopt = N_LOG, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {LAST_CONFLICT} }, .convert = true, @@ -998,17 +830,9 @@ struct opt_params { { .index = S_LOG, .conflicts = { {.opt = OPT_S, .subopt = S_SIZE, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {.opt = OPT_S, .subopt = S_SECTSIZE, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {LAST_CONFLICT} }, .minval = XFS_MIN_SECTORSIZE_LOG, @@ -1018,17 +842,9 @@ struct opt_params { { .index = S_SECTLOG, .conflicts = { {.opt = OPT_S, .subopt = S_SIZE, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {.opt = OPT_S, .subopt = S_SECTSIZE, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {LAST_CONFLICT} }, .minval = XFS_MIN_SECTORSIZE_LOG, @@ -1038,17 +854,9 @@ struct opt_params { { .index = S_SIZE, .conflicts = { {.opt = OPT_S, .subopt = S_LOG, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {.opt = OPT_S, .subopt = S_SECTLOG, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {LAST_CONFLICT} }, .convert = true, @@ -1060,17 +868,9 @@ struct opt_params { { .index = S_SECTSIZE, .conflicts = { {.opt = OPT_S, .subopt = S_LOG, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {.opt = OPT_S, .subopt = S_SECTLOG, - .test_values = false, - .test_default_value = false, - .invalid_value = 0, - .at_value = 0 }, {LAST_CONFLICT} }, .convert = true,