Skip to content

Commit 0ecae54

Browse files
Kemeng Shitytso
authored andcommitted
ext4: initialize sbi->s_freeclusters_counter and sbi->s_dirtyclusters_counter before use in kunit test
Fix that sbi->s_freeclusters_counter and sbi->s_dirtyclusters_counter are used before initialization. Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com> Reported-by: Guenter Roeck <linux@roeck-us.net> Tested-by: Guenter Roeck <linux@roeck-us.net> Link: https://lore.kernel.org/r/20240304163543.6700-4-shikemeng@huaweicloud.com Signed-off-by: Theodore Ts'o <tytso@mit.edu>
1 parent ad94375 commit 0ecae54

File tree

1 file changed

+19
-1
lines changed

1 file changed

+19
-1
lines changed

fs/ext4/mballoc-test.c

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ static struct file_system_type mbt_fs_type = {
4545

4646
static int mbt_mb_init(struct super_block *sb)
4747
{
48+
ext4_fsblk_t block;
4849
int ret;
4950

5051
/* needed by ext4_mb_init->bdev_nonrot(sb->s_bdev) */
@@ -69,8 +70,23 @@ static int mbt_mb_init(struct super_block *sb)
6970
if (ret != 0)
7071
goto err_out;
7172

73+
block = ext4_count_free_clusters(sb);
74+
ret = percpu_counter_init(&EXT4_SB(sb)->s_freeclusters_counter, block,
75+
GFP_KERNEL);
76+
if (ret != 0)
77+
goto err_mb_release;
78+
79+
ret = percpu_counter_init(&EXT4_SB(sb)->s_dirtyclusters_counter, 0,
80+
GFP_KERNEL);
81+
if (ret != 0)
82+
goto err_freeclusters;
83+
7284
return 0;
7385

86+
err_freeclusters:
87+
percpu_counter_destroy(&EXT4_SB(sb)->s_freeclusters_counter);
88+
err_mb_release:
89+
ext4_mb_release(sb);
7490
err_out:
7591
kfree(sb->s_bdev->bd_queue);
7692
kfree(sb->s_bdev);
@@ -79,6 +95,8 @@ static int mbt_mb_init(struct super_block *sb)
7995

8096
static void mbt_mb_release(struct super_block *sb)
8197
{
98+
percpu_counter_destroy(&EXT4_SB(sb)->s_dirtyclusters_counter);
99+
percpu_counter_destroy(&EXT4_SB(sb)->s_freeclusters_counter);
82100
ext4_mb_release(sb);
83101
kfree(sb->s_bdev->bd_queue);
84102
kfree(sb->s_bdev);
@@ -333,7 +351,7 @@ static int mbt_kunit_init(struct kunit *test)
333351
ext4_mb_mark_context,
334352
ext4_mb_mark_context_stub);
335353

336-
/* stub function will be called in mt_mb_init->ext4_mb_init */
354+
/* stub function will be called in mbt_mb_init->ext4_mb_init */
337355
if (mbt_mb_init(sb) != 0) {
338356
mbt_ctx_release(sb);
339357
mbt_ext4_free_super_block(sb);

0 commit comments

Comments
 (0)