diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2001-01-03 13:00:43 +0000 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2001-01-03 13:00:43 +0000 |
| commit | d3f35b645154ea65ff7c955c862a796e2f281927 (patch) | |
| tree | 3d86f5a0478e7e8f4cff80a149355b4522adc097 /e2fsck/journal.c | |
| parent | 26d4042e5480ecfe64a7298a3c3895151f080d9a (diff) | |
| download | e2fsprogs-d3f35b645154ea65ff7c955c862a796e2f281927.tar.gz | |
ChangeLog, journal.c:
journal.c (e2fsck_check_ext3_journal): Force a fsck if we remove the
journal stored on a reserved inode. Also force a fsck if the journal
appears to exist while !NEEDS_RECOVERY, and we forcibly reset the
journal.
Diffstat (limited to 'e2fsck/journal.c')
| -rw-r--r-- | e2fsck/journal.c | 33 |
1 files changed, 28 insertions, 5 deletions
diff --git a/e2fsck/journal.c b/e2fsck/journal.c index 95a45e2a..2c53b5df 100644 --- a/e2fsck/journal.c +++ b/e2fsck/journal.c @@ -479,7 +479,7 @@ int e2fsck_check_ext3_journal(e2fsck_t ctx) int recover = ctx->fs->super->s_feature_incompat & EXT3_FEATURE_INCOMPAT_RECOVER; struct problem_context pctx; - int reset = 0; + int reset = 0, force_fsck = 0; int retval; /* If we don't have any journal features, don't do anything more */ @@ -488,7 +488,7 @@ int e2fsck_check_ext3_journal(e2fsck_t ctx) uuid_is_null(sb->s_journal_uuid)) return 0; -#ifdef JFS_DEBUG +#ifdef JFS_DEBUG /* Enabled by configure --enable-jfs-debug */ journal_enable_debug = 2; #endif clear_problem_context(&pctx); @@ -522,8 +522,18 @@ no_has_journal: if (recover && !fix_problem(ctx, PR_0_JOURNAL_RECOVER_SET, &pctx)) goto no_has_journal; + /* + * Need a full fsck if we are releasing a + * journal on a reserved inode. + */ + force_fsck = recover || + (sb->s_journal_inum < EXT2_FIRST_INODE(sb)); + /* Clear all of the journal fields */ sb->s_journal_inum = 0; - e2fsck_clear_recover(ctx, recover); + sb->s_journal_dev = 0; + memset(sb->s_journal_uuid, 0, + sizeof(sb->s_journal_uuid)); + e2fsck_clear_recover(ctx, force_fsck); } else if (!(ctx->options & E2F_OPT_READONLY)) { sb->s_feature_compat |= EXT3_FEATURE_COMPAT_HAS_JOURNAL; ext2fs_mark_super_dirty(ctx->fs); @@ -533,9 +543,22 @@ no_has_journal: if (sb->s_feature_compat & EXT3_FEATURE_COMPAT_HAS_JOURNAL && !(sb->s_feature_incompat & EXT3_FEATURE_INCOMPAT_RECOVER) && journal->j_superblock->s_start != 0) { - if (fix_problem(ctx, PR_0_JOURNAL_RESET_JOURNAL, &pctx)) + if (fix_problem(ctx, PR_0_JOURNAL_RESET_JOURNAL, &pctx)) { reset = 1; - /* I refuse to enable recovery for journal */ + sb->s_state &= ~EXT2_VALID_FS; + ext2fs_mark_super_dirty(ctx->fs); + } + /* + * If the user answers no to the above question, we + * ignore the fact that journal apparently has data; + * accidentally replaying over valid data would be far + * worse than skipping a questionable recovery. + * + * XXX should we abort with a fatal error here? What + * will the ext3 kernel code do if a filesystem with + * !NEEDS_RECOVERY but with a non-zero + * journal->j_superblock->s_start is mounted? + */ } e2fsck_journal_release(ctx, journal, reset); |