From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com ([209.132.183.28]:52994 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754132AbdCOQBC (ORCPT ); Wed, 15 Mar 2017 12:01:02 -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 5DBCC64D99 for ; Wed, 15 Mar 2017 16:01:02 +0000 (UTC) From: Jan Tulak Subject: [PATCH 21/22] mkfs: remove duplicit checks Date: Wed, 15 Mar 2017 17:00:16 +0100 Message-Id: <20170315160017.27805-22-jtulak@redhat.com> In-Reply-To: <20170315160017.27805-1-jtulak@redhat.com> References: <20170315160017.27805-1-jtulak@redhat.com> Sender: linux-xfs-owner@vger.kernel.org List-ID: List-Id: xfs To: linux-xfs@vger.kernel.org Cc: Jan Tulak Remove old checks that are now done by the conflicts table. Signed-off-by: Jan Tulak --- mkfs/xfs_mkfs.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c index 865bd389..dfb5e300 100644 --- a/mkfs/xfs_mkfs.c +++ b/mkfs/xfs_mkfs.c @@ -2769,26 +2769,6 @@ main( *blocklog = XFS_DFL_BLOCKSIZE_LOG; *blocksize = 1 << XFS_DFL_BLOCKSIZE_LOG; } - if (*blocksize < XFS_MIN_BLOCKSIZE || *blocksize > XFS_MAX_BLOCKSIZE) { - fprintf(stderr, _("illegal block size %d\n"), *blocksize); - usage(); - } - if (sb_feat.crcs_enabled && *blocksize < XFS_MIN_CRC_BLOCKSIZE) { - fprintf(stderr, -_("Minimum block size for CRC enabled filesystems is %d bytes.\n"), - XFS_MIN_CRC_BLOCKSIZE); - usage(); - } - - /* - * If user explicitly stated -m crc=1 -n ftype=0, an error was already - * issued. But if -n ftype=0 was stated alone, then it is a conflict - * with a default value for crc enabled and has to be detected here. - */ - if (sb_feat.crcs_enabled && !sb_feat.dirftype) { - fprintf(stderr, _("cannot disable ftype with crcs enabled\n")); - usage(); - } if (!slflag && !ssflag) { sectorlog = XFS_MIN_SECTORSIZE_LOG; sectorsize = XFS_MIN_SECTORSIZE; -- 2.11.0