From: Andreas Dilger <adilger@clusterfs.com>
Date: Sat, 4 Aug 2001 07:18:34 +0000 (-0600)
Subject: Put check for JOURNAL_DEV before sparse_option, so we don't set the
X-Git-Tag: E2FSPROGS-1_23~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa72458adb65e9dd20dc74a414a9c71fde2a2f5c;p=thirdparty%2Fe2fsprogs.git

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 f67e6e7f9..a6dfa50a1 100644
--- 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);