From 6c60acbb945701a08373bee5b0689563eedf6ed2 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Tue, 15 Jun 2021 21:53:30 -0700 Subject: [PATCH] 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 Signed-off-by: Theodore Ts'o --- e2fsck/recovery.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/e2fsck/recovery.c b/e2fsck/recovery.c index 02694d2c..25744f08 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); -- 2.11.4.GIT