linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Zhang Yi <yi.zhang@huaweicloud.com>
To: linux-ext4@vger.kernel.org
Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
	tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz,
	ojaswin@linux.ibm.com, yi.zhang@huawei.com,
	yi.zhang@huaweicloud.com, libaokun1@huawei.com,
	yukuai3@huawei.com, yangerkun@huawei.com
Subject: [PATCH v2 6/6] ext4: fix insufficient credits calculation in ext4_meta_trans_blocks()
Date: Wed, 11 Jun 2025 19:16:25 +0800	[thread overview]
Message-ID: <20250611111625.1668035-7-yi.zhang@huaweicloud.com> (raw)
In-Reply-To: <20250611111625.1668035-1-yi.zhang@huaweicloud.com>

From: Zhang Yi <yi.zhang@huawei.com>

The calculation of journal credits in ext4_meta_trans_blocks() should
include pextents, as each extent separately may be allocated from a
different group and thus need to update different bitmap and group
descriptor block.

Fixes: 0e32d8617012 ("ext4: correct the journal credits calculations of allocating blocks")
Reported-by: Jan Kara <jack@suse.cz>
Closes: https://lore.kernel.org/linux-ext4/nhxfuu53wyacsrq7xqgxvgzcggyscu2tbabginahcygvmc45hy@t4fvmyeky33e/
Signed-off-by: Zhang Yi <yi.zhang@huawei.com>
Reviewed-by: Jan Kara <jack@suse.cz>
---
 fs/ext4/inode.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 9835145b1b27..9b6ebf823740 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -6218,7 +6218,7 @@ int ext4_meta_trans_blocks(struct inode *inode, int lblocks, int pextents)
 	int ret;
 
 	/*
-	 * How many index and lead blocks need to touch to map @lblocks
+	 * How many index and leaf blocks need to touch to map @lblocks
 	 * logical blocks to @pextents physical extents?
 	 */
 	idxblocks = ext4_index_trans_blocks(inode, lblocks, pextents);
@@ -6227,7 +6227,7 @@ int ext4_meta_trans_blocks(struct inode *inode, int lblocks, int pextents)
 	 * Now let's see how many group bitmaps and group descriptors need
 	 * to account
 	 */
-	groups = idxblocks;
+	groups = idxblocks + pextents;
 	gdpblocks = groups;
 	if (groups > ngroups)
 		groups = ngroups;
-- 
2.46.1


  parent reply	other threads:[~2025-06-11 11:29 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-06-11 11:16 [PATCH v2 0/6] ext4: fix insufficient credits when writing back large folios Zhang Yi
2025-06-11 11:16 ` [PATCH v2 1/6] ext4: move the calculation of wbc->nr_to_write to mpage_folio_done() Zhang Yi
2025-06-19 15:08   ` Jan Kara
2025-06-20  1:51   ` Baokun Li
2025-06-11 11:16 ` [PATCH v2 2/6] ext4: fix stale data if it bail out of the extents mapping loop Zhang Yi
2025-06-19 16:21   ` Jan Kara
2025-06-20  4:57     ` Zhang Yi
2025-06-20 15:21       ` Jan Kara
2025-06-21  4:42         ` Zhang Yi
2025-06-23  7:38           ` Jan Kara
2025-06-11 11:16 ` [PATCH v2 3/6] ext4: restart handle if credits are insufficient during allocating blocks Zhang Yi
2025-06-19 16:33   ` Jan Kara
2025-06-20  5:00     ` Zhang Yi
2025-06-20 14:18       ` Jan Kara
2025-06-21  6:30         ` Zhang Yi
2025-06-11 11:16 ` [PATCH v2 4/6] ext4: correct the reserved credits for extent conversion Zhang Yi
2025-06-23  8:12   ` Baokun Li
2025-06-11 11:16 ` [PATCH v2 5/6] ext4/jbd2: reintroduce jbd2_journal_blocks_per_page() Zhang Yi
2025-06-19 16:44   ` Jan Kara
2025-06-21  7:46     ` Zhang Yi
2025-06-23  7:26       ` Jan Kara
2025-06-11 11:16 ` Zhang Yi [this message]
2025-06-23  8:12   ` [PATCH v2 6/6] ext4: fix insufficient credits calculation in ext4_meta_trans_blocks() Baokun Li

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=20250611111625.1668035-7-yi.zhang@huaweicloud.com \
    --to=yi.zhang@huaweicloud.com \
    --cc=adilger.kernel@dilger.ca \
    --cc=jack@suse.cz \
    --cc=libaokun1@huawei.com \
    --cc=linux-ext4@vger.kernel.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=ojaswin@linux.ibm.com \
    --cc=tytso@mit.edu \
    --cc=yangerkun@huawei.com \
    --cc=yi.zhang@huawei.com \
    --cc=yukuai3@huawei.com \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).