From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 58BE9C49361 for ; Wed, 16 Jun 2021 04:56:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3EA6F610A0 for ; Wed, 16 Jun 2021 04:56:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229569AbhFPE6v (ORCPT ); Wed, 16 Jun 2021 00:58:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:38816 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229559AbhFPE6r (ORCPT ); Wed, 16 Jun 2021 00:58:47 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4A04C613B9 for ; Wed, 16 Jun 2021 04:56:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1623819402; bh=cp+/sUprr2jxLTFO95sbImHWfZ6xm97+fgls0B+Tf24=; h=From:To:Subject:Date:In-Reply-To:References:From; b=lrOPnektRvzrIWj7poz+72rtoQj79A5tpZgpG+KiRBQmyjwouMBsToS9+hlmk0FNp GckvwVyt11VZW6Tlz3CF8NDv6DAo2ed0OFPiYgdIuUGcsXoH+utSs6skdQXGvrpWkV mjmq79as+ytxc2tJc3dasvLHzJ9S5mNxA596xxUbPM6zubd2W9OFT34XR4VvWiLeNV /3I3hL18b2RS2MPxUxH3DwHnBEd1OsWTzjYy/+gp+brx3a7mR30wKCnMbffcQlY7fA w14xU458GefzpFxLmtT12mMVTFc3ZNBt7FSOeOdhpoox+OhC2MdJuXLkrtlYmLgJCu ID4gSa7URNluA== From: Eric Biggers 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 Message-Id: <20210616045334.1655288-3-ebiggers@kernel.org> X-Mailer: git-send-email 2.32.0.272.g935e593368-goog In-Reply-To: <20210616045334.1655288-1-ebiggers@kernel.org> References: <20210616045334.1655288-1-ebiggers@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Eric Biggers 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 --- 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