aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2021-06-15 21:53:30 -0700
committerTheodore Ts'o <tytso@mit.edu>2021-07-06 22:41:45 -0400
commit6c60acbb945701a08373bee5b0689563eedf6ed2 (patch)
treefb4751962c951c34798ea62bbad3f233ed643327
parent19e50aa76263793ae46e8a2540d238faaf1492ad (diff)
downloade2fsprogs-6c60acbb945701a08373bee5b0689563eedf6ed2.tar.gz
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>
-rw-r--r--e2fsck/recovery.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/e2fsck/recovery.c b/e2fsck/recovery.c
index 02694d2cb..25744f088 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);