From 2aca16d6b21d30f52ffdc6c1c6184c694a5dd9f9 Mon Sep 17 00:00:00 2001 From: Jan Tulak Date: Tue, 10 May 2016 17:16:07 +1000 Subject: [PATCH] mkfs: conflicting values with disabled crc should fail If crc=0, then finobt=1 and spinodes=1 should both fail, instead of a warning. [dchinner: whitespace fixes. ] Signed-off-by: Jan Tulak Reviewed-by: Dave Chinner Signed-off-by: Dave Chinner --- mkfs/xfs_mkfs.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c index 2e4feb835..955dcfdda 100644 --- a/mkfs/xfs_mkfs.c +++ b/mkfs/xfs_mkfs.c @@ -2388,21 +2388,24 @@ _("32 bit Project IDs always enabled on CRC enabled filesytems\n")); } else { /* * The kernel doesn't currently support crc=0,finobt=1 - * filesystems. If crcs are not enabled and the user has - * explicitly turned them off then silently turn them off - * to avoid an unnecessary warning. If the user explicitly - * tried to use crc=0,finobt=1, then issue a warning before - * turning them off. The same is also for sparse inodes. + * filesystems. If crcs are not enabled and the user has not + * explicitly turned finobt on, then silently turn it off to + * avoid an unnecessary warning. + * If the user explicitly tried to use crc=0,finobt=1, + * then issue an error. + * The same is also for sparse inodes. */ if (sb_feat.finobt && mopts.subopt_params[M_FINOBT].seen) { fprintf(stderr, -_("warning: finobt not supported without CRC support, disabled.\n")); +_("finobt not supported without CRC support\n")); + usage(); } sb_feat.finobt = 0; if (sb_feat.spinodes) { fprintf(stderr, - _("warning: sparse inodes not supported without CRC support, disabled.\n")); +_("sparse inodes not supported without CRC support\n")); + usage(); } sb_feat.spinodes = 0; -- 2.47.2