From: Kemeng Shi <shikemeng@huaweicloud.com>
To: tytso@mit.edu, adilger.kernel@dilger.ca
Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org,
naresh.kamboju@linaro.org, daniel.diaz@linaro.org,
linux@roeck-us.net, brauner@kernel.org
Subject: [PATCH v3 3/3] ext4: initialize sbi->s_freeclusters_counter before use in kunit test
Date: Sun, 3 Mar 2024 02:17:55 +0800 [thread overview]
Message-ID: <20240302181755.9192-4-shikemeng@huaweicloud.com> (raw)
In-Reply-To: <20240302181755.9192-1-shikemeng@huaweicloud.com>
Fix warnning that sbi->s_freeclusters_counter is used before
initialization.
Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com>
---
fs/ext4/mballoc-test.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/fs/ext4/mballoc-test.c b/fs/ext4/mballoc-test.c
index 4d9eb4807c98..00fc0f8b3809 100644
--- a/fs/ext4/mballoc-test.c
+++ b/fs/ext4/mballoc-test.c
@@ -45,6 +45,7 @@ static struct file_system_type mbt_fs_type = {
static int mbt_mb_init(struct super_block *sb)
{
+ ext4_fsblk_t block;
int ret;
/* needed by ext4_mb_init->bdev_nonrot(sb->s_bdev) */
@@ -69,8 +70,16 @@ static int mbt_mb_init(struct super_block *sb)
if (ret != 0)
goto err_out;
+ block = ext4_count_free_clusters(sb);
+ ret = percpu_counter_init(&EXT4_SB(sb)->s_freeclusters_counter, block,
+ GFP_KERNEL);
+ if (ret != 0)
+ goto err_mb_release;
+
return 0;
+err_mb_release:
+ ext4_mb_release(sb);
err_out:
kfree(sb->s_bdev->bd_queue);
kfree(sb->s_bdev);
@@ -79,6 +88,7 @@ static int mbt_mb_init(struct super_block *sb)
static void mbt_mb_release(struct super_block *sb)
{
+ percpu_counter_destroy(&EXT4_SB(sb)->s_freeclusters_counter);
ext4_mb_release(sb);
kfree(sb->s_bdev->bd_queue);
kfree(sb->s_bdev);
@@ -333,7 +343,7 @@ static int mbt_kunit_init(struct kunit *test)
ext4_mb_mark_context,
ext4_mb_mark_context_stub);
- /* stub function will be called in mt_mb_init->ext4_mb_init */
+ /* stub function will be called in mbt_mb_init->ext4_mb_init */
if (mbt_mb_init(sb) != 0) {
mbt_ctx_release(sb);
mbt_ext4_free_super_block(sb);
@@ -534,6 +544,7 @@ static void test_mark_diskspace_used(struct kunit *test)
struct test_range ranges[TEST_RANGE_COUNT];
int i;
+
mbt_generate_test_ranges(sb, ranges, TEST_RANGE_COUNT);
ac.ac_status = AC_STATUS_FOUND;
--
2.30.0
next prev parent reply other threads:[~2024-03-02 9:21 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-02 18:17 [PATCH v3 0/3] Fix crashes and warning in ext4 unit test Kemeng Shi
2024-03-02 18:17 ` [PATCH v3 1/3] ext4: alloc test super block from sget Kemeng Shi
2024-03-02 18:17 ` [PATCH v3 2/3] ext4: hold group lock in ext4 kunit test Kemeng Shi
2024-03-02 18:17 ` Kemeng Shi [this message]
2024-03-03 15:33 ` [PATCH v3 0/3] Fix crashes and warning in ext4 unit test Guenter Roeck
2024-03-04 6:33 ` Kemeng Shi
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=20240302181755.9192-4-shikemeng@huaweicloud.com \
--to=shikemeng@huaweicloud.com \
--cc=adilger.kernel@dilger.ca \
--cc=brauner@kernel.org \
--cc=daniel.diaz@linaro.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=naresh.kamboju@linaro.org \
--cc=tytso@mit.edu \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).