diff mbox series

[2/6] e2fsck: sync fc_do_one_pass() changes from kernel

Message ID 20210616045334.1655288-3-ebiggers@kernel.org
State Accepted
Headers show
Series e2fsprogs: fix compiler warnings introduced since v1.45.4 | expand

Commit Message

Eric Biggers June 16, 2021, 4:53 a.m. UTC 
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(-)

Comments

Theodore Ts'o July 7, 2021, 2:42 a.m. UTC | #1 
On Tue, Jun 15, 2021 at 09:53:30PM -0700, Eric Biggers wrote:
> 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>

Applied, thanks.

						- Ted
diff mbox series

Patch

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);