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 76b8b8c6f199bc3dea24a9607e5bab4507aca48e..c111393aa6e73c7741b6de8999c1667cb958be1c 100644 (file)
--- 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) {