From: Theodore Ts'o <tytso@mit.edu>
Date: Thu, 1 Sep 2022 19:15:33 +0000 (-0400)
Subject: mke2fs: disable orphan_file if the fs is too small to support a journal
X-Git-Tag: v1.47.0~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2e6b62711bab9d6eef6dda29d5e58d28aea0af66;p=thirdparty%2Fe2fsprogs.git

mke2fs: disable orphan_file if the fs is too small to support a journal

Otherwise, e2fsck will complain that resulting file system has the
orphan_file feature set without the journal being enabled.

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

diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index 76b8b8c6f..c111393aa 100644
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -3478,6 +3478,9 @@ int main (int argc, char *argv[])
 
 		if (!jparams.num_journal_blocks) {
 			ext2fs_clear_feature_journal(fs->super);
+			ext2fs_clear_feature_orphan_file(fs->super);
+			ext2fs_clear_feature_journal(&fs_param);
+			ext2fs_clear_feature_orphan_file(&fs_param);
 			goto no_journal;
 		}
 		if (!quiet) {