From: Eric Biggers <ebiggers@kernel.org>
To: linux-ext4@vger.kernel.org
Subject: [PATCH 2/6] e2fsck: sync fc_do_one_pass() changes from kernel
Date: Tue, 15 Jun 2021 21:53:30 -0700 [thread overview]
Message-ID: <20210616045334.1655288-3-ebiggers@kernel.org> (raw)
In-Reply-To: <20210616045334.1655288-1-ebiggers@kernel.org>
From: Eric Biggers <ebiggers@google.com>
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>
---
e2fsck/recovery.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/e2fsck/recovery.c b/e2fsck/recovery.c
index dc0694fc..1e07dfac 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.32.0.272.g935e593368-goog
next prev parent reply other threads:[~2021-06-16 4:56 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-16 4:53 [PATCH 0/6] e2fsprogs: fix compiler warnings introduced since v1.45.4 Eric Biggers
2021-06-16 4:53 ` [PATCH 1/6] libext2fs: improve jbd_debug() implementation Eric Biggers
2021-07-07 2:38 ` Theodore Ts'o
2021-06-16 4:53 ` Eric Biggers [this message]
2021-07-07 2:42 ` [PATCH 2/6] e2fsck: sync fc_do_one_pass() changes from kernel Theodore Ts'o
2021-06-16 4:53 ` [PATCH 3/6] mke2fs: use ext2fs_get_device_size2() on all platforms Eric Biggers
2021-07-07 2:43 ` Theodore Ts'o
2021-06-16 4:53 ` [PATCH 4/6] Fix -Wunused-parameter warnings Eric Biggers
2021-07-07 2:44 ` Theodore Ts'o
2021-06-16 4:53 ` [PATCH 5/6] Fix -Wunused-variable warnings Eric Biggers
2021-07-07 3:13 ` Theodore Ts'o
2021-06-16 4:53 ` [PATCH 6/6] libext2fs: fix a -Wunused-label warning Eric Biggers
2021-07-07 3:14 ` Theodore Ts'o
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210616045334.1655288-3-ebiggers@kernel.org \
--to=ebiggers@kernel.org \
--cc=linux-ext4@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.