diff mbox

[06/24] e2fsck: don't offer to recreate the journal if fsck is aborting due to bad block bitmaps

Message ID 20140718225256.31374.91713.stgit@birch.djwong.org
State Accepted, archived
Headers show

Commit Message

Darrick Wong July 18, 2014, 10:52 p.m. UTC 
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>
---
 e2fsck/unix.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)



--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Theodore Ts'o July 22, 2014, 5:58 p.m. UTC | #1 
On Fri, Jul 18, 2014 at 03:52:56PM -0700, Darrick J. Wong wrote:
> 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>

Thanks, applied.

					- Ted
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/e2fsck/unix.c b/e2fsck/unix.c
index 7055a92..bb5141f 100644
--- a/e2fsck/unix.c
+++ b/e2fsck/unix.c
@@ -1642,7 +1642,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));