From: Jan Tulak <jtulak@redhat.com>
Date: Tue, 10 May 2016 07:16:07 +0000 (+1000)
Subject: mkfs: move spinodes crc check
X-Git-Tag: v4.7.0-rc1~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ddc3b2da79826ae6cdc3f5f8b868cc104d0c6975;p=thirdparty%2Fxfsprogs-dev.git

mkfs: move spinodes crc check

Spinodes crc check is now moved to be in the same way as finobt.

Signed-off-by: Jan Tulak <jtulak@redhat.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
---

diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index 881a2b333..0a55a1776 100644
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -2388,19 +2388,20 @@ _("32 bit Project IDs always enabled on CRC enabled filesytems\n"));
 		 * 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.
+		 * turning them off. 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"));
 		}
 		sb_feat.finobt = 0;
-	}
 
-	if (sb_feat.spinodes && !sb_feat.crcs_enabled) {
-		fprintf(stderr,
-_("warning: sparse inodes not supported without CRC support, disabled.\n"));
+		if (sb_feat.spinodes) {
+			fprintf(stderr,
+	_("warning: sparse inodes not supported without CRC support, disabled.\n"));
+		}
 		sb_feat.spinodes = 0;
+
 	}
 
 	if (nsflag || nlflag) {