From: Eric Biggers <ebiggers@google.com>
Date: Wed, 16 Jun 2021 04:53:30 +0000 (-0700)
Subject: e2fsck: sync fc_do_one_pass() changes from kernel
X-Git-Tag: v1.46.3~28
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=6c60acbb945701a08373bee5b0689563eedf6ed2;p=tools%2Fe2fsprogs.git

e2fsck: sync fc_do_one_pass() changes from kernel

Sync the changes to fc_do_one_pass() from the kernel's recovery.c so
that e2fsck picks up the fixes to the jbd_debug() statements.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---

diff --git a/e2fsck/recovery.c b/e2fsck/recovery.c
index 02694d2..25744f0 100644
--- a/e2fsck/recovery.c
+++ b/e2fsck/recovery.c
@@ -245,15 +245,14 @@ static int fc_do_one_pass(journal_t *journal,
 		return 0;
 
 	while (next_fc_block <= journal->j_fc_last) {
-		jbd_debug(3, "Fast commit replay: next block %ld",
+		jbd_debug(3, "Fast commit replay: next block %ld\n",
 			  next_fc_block);
 		err = jread(&bh, journal, next_fc_block);
 		if (err) {
-			jbd_debug(3, "Fast commit replay: read error");
+			jbd_debug(3, "Fast commit replay: read error\n");
 			break;
 		}
 
-		jbd_debug(3, "Processing fast commit blk with seq %d");
 		err = journal->j_fc_replay_callback(journal, bh, pass,
 					next_fc_block - journal->j_fc_first,
 					expected_commit_id);