ChangeLog, unix.c:

unix.c (main): If we're doing a read-only check, skip the journal
  	playback, but don't abort the e2fsck run.
This commit is contained in:
Theodore Ts'o 2000-08-22 21:50:04 +00:00
parent 99a2cc969f
commit 2575fb0443
2 changed files with 18 additions and 8 deletions

View File

@ -1,5 +1,8 @@
2000-08-22 <tytso@valinux.com>
* unix.c (main): If we're doing a read-only check, skip the
journal playback, but don't abort the e2fsck run.
* super.c (release_orphan_inodes): Fix typo; should do bounds
checking on next_ino instead of ino.

View File

@ -808,16 +808,23 @@ restart:
}
if (s->s_feature_incompat & EXT3_FEATURE_INCOMPAT_RECOVER) {
retval = e2fsck_run_ext3_journal(ctx);
if (retval) {
com_err(ctx->program_name, retval,
if (ctx->options & E2F_OPT_READONLY) {
printf(_("Warning: skipping journal recovery "
"because doing a read-only filesystem "
"check.\n"));
io_channel_flush(ctx->fs->io);
} else {
retval = e2fsck_run_ext3_journal(ctx);
if (retval) {
com_err(ctx->program_name, retval,
_("while recovering ext3 journal of %s"),
ctx->device_name);
fatal_error(ctx, 0);
ctx->device_name);
fatal_error(ctx, 0);
}
ext2fs_close(ctx->fs);
ctx->fs = 0;
goto restart;
}
ext2fs_close(ctx->fs);
ctx->fs = 0;
goto restart;
}
/*