From: Theodore Ts'o <tytso@mit.edu>
Date: Tue, 31 Mar 2009 11:42:24 +0000 (-0400)
Subject: mke2fs: Don't try to create the journal in super-only mode
X-Git-Tag: v1.41.5~40
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a620baddee647faf42c49ee2e04ee3f667149d68;p=thirdparty%2Fe2fsprogs.git

mke2fs: Don't try to create the journal in super-only mode

Since we aren't initializing the inode table, creating the journal
will just fail.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---

diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index e69e5ceab..4f50ffa9e 100644
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -2079,6 +2079,12 @@ int main (int argc, char *argv[])
 		    EXT3_FEATURE_COMPAT_HAS_JOURNAL)) {
 		journal_blocks = figure_journal_size(journal_size, fs);
 
+		if (super_only) {
+			printf(_("Skipping journal creation in super-only mode\n"));
+			fs->super->s_journal_inum = EXT2_JOURNAL_INO;
+			goto no_journal;
+		}
+
 		if (!journal_blocks) {
 			fs->super->s_feature_compat &=
 				~EXT3_FEATURE_COMPAT_HAS_JOURNAL;