]> git.ipfire.org Git - thirdparty/xfsprogs-dev.git/commitdiff
mkfs: move spinodes crc check
authorJan Tulak <jtulak@redhat.com>
Tue, 10 May 2016 07:16:07 +0000 (17:16 +1000)
committerDave Chinner <david@fromorbit.com>
Tue, 10 May 2016 07:16:07 +0000 (17:16 +1000)
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>
mkfs/xfs_mkfs.c

index 881a2b3333715f0158eb02ca7fff42254319f481..0a55a1776c0e3939fbeb297a965397bd7810975c 100644 (file)
@@ -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) {