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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 30CB9C43603 for ; Wed, 11 Dec 2019 15:45:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 060B12073B for ; Wed, 11 Dec 2019 15:45:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576079118; bh=T4EooRhKtBil5rWh1xTbhaj84r+8wFe+9wG1MwmvJD8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Ft2yXT+K1fnWgEgZWOM7gjUPBDkO8YwlTgf5sgh6jO/9DRJGT1vYMlEpgTRYiAiaB RSfuE+qVhjp3yGPiw91WaVV4QohV3Xdgy7CY3i+8R9f7GYfgruU6GHtOVegUSdfYCP bNSyDt3bC/cC19RaZmp4LmuI/QrrRKFue4zBHLA4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388555AbfLKPpR (ORCPT ); Wed, 11 Dec 2019 10:45:17 -0500 Received: from mail.kernel.org ([198.145.29.99]:60956 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733257AbfLKP1L (ORCPT ); Wed, 11 Dec 2019 10:27:11 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 341242173E; Wed, 11 Dec 2019 15:27:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576078030; bh=T4EooRhKtBil5rWh1xTbhaj84r+8wFe+9wG1MwmvJD8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mOr1mMG+Aw0x7kU2cmQWDHQnAyOK0xttXI9AkQj13FFMuHmOn5ePyc23dRbnsveWB H6rGQ0VCUMQN2YSBqURO4t4iklpFVGATXS4RtlqIYH3XzysKBAwawZ+VNn+ZW1l9KK 3EY+UVC5ge/ZnmITHu7oq0bZvoutiR3bbv6Gx7nc= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jan Kara , Theodore Ts'o , Sasha Levin , linux-ext4@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 25/79] jbd2: Fix statistics for the number of logged blocks Date: Wed, 11 Dec 2019 10:25:49 -0500 Message-Id: <20191211152643.23056-25-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191211152643.23056-1-sashal@kernel.org> References: <20191211152643.23056-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jan Kara [ Upstream commit 015c6033068208d6227612c878877919f3fcf6b6 ] jbd2 statistics counting number of blocks logged in a transaction was wrong. It didn't count the commit block and more importantly it didn't count revoke descriptor blocks. Make sure these get properly counted. Reviewed-by: Theodore Ts'o Signed-off-by: Jan Kara Link: https://lore.kernel.org/r/20191105164437.32602-13-jack@suse.cz Signed-off-by: Theodore Ts'o Signed-off-by: Sasha Levin --- fs/jbd2/commit.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c index 24f86ffe11d74..020bd7a0d8e03 100644 --- a/fs/jbd2/commit.c +++ b/fs/jbd2/commit.c @@ -724,7 +724,6 @@ start_journal_io: submit_bh(REQ_OP_WRITE, REQ_SYNC, bh); } cond_resched(); - stats.run.rs_blocks_logged += bufs; /* Force a new descriptor to be generated next time round the loop. */ @@ -811,6 +810,7 @@ start_journal_io: if (unlikely(!buffer_uptodate(bh))) err = -EIO; jbd2_unfile_log_bh(bh); + stats.run.rs_blocks_logged++; /* * The list contains temporary buffer heads created by @@ -856,6 +856,7 @@ start_journal_io: BUFFER_TRACE(bh, "ph5: control buffer writeout done: unfile"); clear_buffer_jwrite(bh); jbd2_unfile_log_bh(bh); + stats.run.rs_blocks_logged++; __brelse(bh); /* One for getblk */ /* AKPM: bforget here */ } @@ -877,6 +878,7 @@ start_journal_io: } if (cbh) err = journal_wait_on_commit_record(journal, cbh); + stats.run.rs_blocks_logged++; if (jbd2_has_feature_async_commit(journal) && journal->j_flags & JBD2_BARRIER) { blkdev_issue_flush(journal->j_dev, GFP_NOFS, NULL); -- 2.20.1