From: Theodore Ts'o <tytso@mit.edu>
Date: Tue, 22 Aug 2000 21:50:04 +0000 (+0000)
Subject: ChangeLog, unix.c:
X-Git-Tag: E2FSPROGS-1_20~239
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2575fb04439938a9ca3e34d06409cca378d84357;p=thirdparty%2Fe2fsprogs.git

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.
---

diff --git a/e2fsck/ChangeLog b/e2fsck/ChangeLog
index de93ab1de..7fd1f7a23 100644
--- a/e2fsck/ChangeLog
+++ b/e2fsck/ChangeLog
@@ -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.
 
diff --git a/e2fsck/unix.c b/e2fsck/unix.c
index 1a258316c..29e13f549 100644
--- a/e2fsck/unix.c
+++ b/e2fsck/unix.c
@@ -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;
 	}
 
 	/*