e2fsck: don't offer to recreate the journal if fsck is aborting due to bad block...

If e2fsck knows the bitmaps are bad at the exit (probably because they
were bad at the start and have not been fixed), don't offer to
recreate the journal because doing so causes e2fsck to abort a second
time.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/e2fsck/unix.c b/e2fsck/unix.c
index 03848c77fe15dc31ec981876653e76575d7a90b4..8d1bdf3e03cb2df6b38639144bec5877303542e1 100644 (file)
--- a/e2fsck/unix.c
+++ b/e2fsck/unix.c
@@ -1636,7 +1636,8 @@ print_unsupp_features:
        run_result = e2fsck_run(ctx);
        e2fsck_clear_progbar(ctx);
 
-       if (ctx->flags & E2F_FLAG_JOURNAL_INODE) {
+       if (!ctx->invalid_bitmaps &&
+           (ctx->flags & E2F_FLAG_JOURNAL_INODE)) {
                if (fix_problem(ctx, PR_6_RECREATE_JOURNAL, &pctx)) {
                        if (journal_size < 1024)
                                journal_size = ext2fs_default_journal_size(ext2fs_blocks_count(fs->super));