Put check for JOURNAL_DEV before sparse_option, so we don't set the

sparse superblock flag on journal devices.

diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index f67e6e7f93b6aa0d67281f3bd42a7f8330108ab1..a6dfa50a1dd624e8a0bccaaf4b1d13c771de7abd 100644 (file)
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -1004,6 +1004,12 @@ static void PRS(int argc, char *argv[])
                exit(1);
        }
 
+       if (param.s_feature_incompat & EXT3_FEATURE_INCOMPAT_JOURNAL_DEV) {
+               if (!fs_type)
+                       fs_type = "journal";
+               reserved_ratio = 0;
+               sparse_option = 0;
+       }
        if (sparse_option)
                param.s_feature_ro_compat |=
                        EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER;
@@ -1067,11 +1073,6 @@ static void PRS(int argc, char *argv[])
        if ((param.s_feature_compat & EXT3_FEATURE_COMPAT_HAS_JOURNAL) &&
            !journal_size)
                journal_size = -1;
-       if (param.s_feature_incompat & EXT3_FEATURE_INCOMPAT_JOURNAL_DEV) {
-               if (!fs_type)
-                       fs_type = "journal";
-               reserved_ratio = 0;
-       }
 
        set_fs_defaults(fs_type, &param, blocksize, &inode_ratio);