[21/22] mkfs: remove duplicit checks

Commit Message

Jan Tulak March 15, 2017, 4 p.m. UTC

Remove old checks that are now done by the conflicts table.

Signed-off-by: Jan Tulak <[e-mail]>
---
 mkfs/xfs_mkfs.c | 20 --------------------
 1 file changed, 20 deletions(-)

Patch

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;