On Wed, Dec 07, 2016 at 02:27:28PM +0100, Jan Tulak wrote:
> Remove old checks that are now done by the conflicts table.
>
> Signed-off-by: Jan Tulak <jtulak@xxxxxxxxxx>
Reviewed-by: Bill O'Donnell <billodo@xxxxxxxxxx>
> ---
> mkfs/xfs_mkfs.c | 20 --------------------
> 1 file changed, 20 deletions(-)
>
> diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
> index 9c1ad11..cd0eb20 100644
> --- a/mkfs/xfs_mkfs.c
> +++ b/mkfs/xfs_mkfs.c
> @@ -2760,26 +2760,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.8.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
