diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2014-07-06 00:09:27 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2014-07-06 00:09:27 -0400 |
| commit | 7f7d1cb462789eef8e359caa46523ed6b99255e1 (patch) | |
| tree | e23923e05256deb1712ff21d4799312a0a6f1142 /e2fsck/journal.c | |
| parent | 328731738d88eb6c32c784e7aa7871e576e9e8a5 (diff) | |
| parent | cd75fb04510073004f8ef005e06733813faad2de (diff) | |
| download | e2fsprogs-7f7d1cb462789eef8e359caa46523ed6b99255e1.tar.gz | |
Merge branch 'maint' into next
Conflicts:
debugfs/set_fields.c
tests/f_mmp/script
tests/f_mmp_garbage/script
tests/m_mmp/script
tests/t_mmp_1on/script
tests/t_mmp_2off/script
Diffstat (limited to 'e2fsck/journal.c')
| -rw-r--r-- | e2fsck/journal.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/e2fsck/journal.c b/e2fsck/journal.c index a7b1150e..a971df1d 100644 --- a/e2fsck/journal.c +++ b/e2fsck/journal.c @@ -820,7 +820,6 @@ errcode_t e2fsck_check_ext3_journal(e2fsck_t ctx) no_has_journal: if (!(sb->s_feature_compat & EXT3_FEATURE_COMPAT_HAS_JOURNAL)) { recover = sb->s_feature_incompat & EXT3_FEATURE_INCOMPAT_RECOVER; - pctx.str = "inode"; if (fix_problem(ctx, PR_0_JOURNAL_HAS_JOURNAL, &pctx)) { if (recover && !fix_problem(ctx, PR_0_JOURNAL_RECOVER_SET, &pctx)) @@ -966,7 +965,7 @@ errcode_t e2fsck_run_ext3_journal(e2fsck_t ctx) ext2fs_mmp_stop(ctx->fs); ext2fs_free(ctx->fs); - retval = ext2fs_open(ctx->filesystem_name, EXT2_FLAG_RW, + retval = ext2fs_open(ctx->filesystem_name, ctx->openfs_flags, ctx->superblock, blocksize, io_ptr, &ctx->fs); if (retval) { |