From patchwork Wed Dec 7 13:27:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Tulak X-Patchwork-Id: 9486785 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 A343E4796AE for ; Wed, 7 Dec 2016 07:34:08 -0600 (CST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752951AbcLGNfI (ORCPT ); Wed, 7 Dec 2016 08:35:08 -0500 Received: from mx1.redhat.com ([209.132.183.28]:34620 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752932AbcLGNfG (ORCPT ); Wed, 7 Dec 2016 08:35:06 -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 8C0337AEAA for ; Wed, 7 Dec 2016 13:27:59 +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 uB7DRdo6022223; Wed, 7 Dec 2016 08:27:58 -0500 From: Jan Tulak To: linux-xfs@vger.kernel.org Cc: Jan Tulak Subject: [PATCH 18/22] mkfs: prevent sector/blocksize to be specified as a number of blocks Date: Wed, 7 Dec 2016 14:27:25 +0100 Message-Id: <1481117249-21273-19-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.25]); Wed, 07 Dec 2016 13:27:59 +0000 (UTC) Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org Documentation states that the options blocked in this patch accepts the size only in bytes. So prevent blocksize or sectorsize to be specified as a number of blocks or sectors. Signed-off-by: Jan Tulak Reviewed-by: Bill O'Donnell --- mkfs/xfs_mkfs.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c index d55eb9a..e8fd49b 100644 --- a/mkfs/xfs_mkfs.c +++ b/mkfs/xfs_mkfs.c @@ -2041,6 +2041,27 @@ getnum( } } + /* Prevent things like specifying blocksize as a number of blocks. */ + if (opts->index == OPT_B || opts->index == OPT_S || + (opts->index == OPT_L && (index == L_SECTLOG || + index == L_SECTSIZE)) || + (opts->index == OPT_N && (index == N_SIZE)) || + (opts->index == OPT_D && (index == D_SECTLOG || + index == D_SECTSIZE)) + + ) { + switch (str[strlen(str)-1]) { + case 'b': + case 's': + fprintf(stderr, + _("You can't set a sector or block size in " + "number of blocks or sectors (-%c %s).\n"), + opts->name, opts->subopts[index]); + exit(1); + } + + } + sp->seen = true; if (test_uvalue_num(sp->type, sp->minval, 0) &&