Commit be1c2e8a authored by Zilin Guan's avatar Zilin Guan Committed by David Sterba
Browse files

btrfs: tests: fix root tree leak in btrfs_test_qgroups() 



If btrfs_insert_fs_root() fails, the tmp_root allocated by
btrfs_alloc_dummy_root() is leaked because its initial reference count
is not decremented.

Fix this by calling btrfs_put_root() unconditionally after
btrfs_insert_fs_root(). This ensures the local reference is always
dropped.

Also fix a copy-paste error in the error message where the subvolume
root insertion failure was incorrectly logged as "fs root".

Co-developed-by: default avatarJianhao Xu <jianhao.xu@seu.edu.cn>
Signed-off-by: default avatarJianhao Xu <jianhao.xu@seu.edu.cn>
Signed-off-by: default avatarZilin Guan <zilin@seu.edu.cn>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 1e1f2055

fs/btrfs/tests/qgroup-tests.c

+3 −3
Original line number Diff line number Diff line
@@ -517,11 +517,11 @@ int btrfs_test_qgroups(u32 sectorsize, u32 nodesize) 
	tmp_root->root_key.objectid = BTRFS_FS_TREE_OBJECTID;

	root->fs_info->fs_root = tmp_root;

	ret = btrfs_insert_fs_root(root->fs_info, tmp_root);

	btrfs_put_root(tmp_root);

	if (ret) {

		test_err("couldn't insert fs root %d", ret);

		goto out;

	}

	btrfs_put_root(tmp_root);



	tmp_root = btrfs_alloc_dummy_root(fs_info);

	if (IS_ERR(tmp_root)) {
@@ -532,11 +532,11 @@ int btrfs_test_qgroups(u32 sectorsize, u32 nodesize) 


	tmp_root->root_key.objectid = BTRFS_FIRST_FREE_OBJECTID;

	ret = btrfs_insert_fs_root(root->fs_info, tmp_root);

	btrfs_put_root(tmp_root);

	if (ret) {

		test_err("couldn't insert fs root %d", ret);

		test_err("couldn't insert subvolume root %d", ret);

		goto out;

	}

	btrfs_put_root(tmp_root);



	test_msg("running qgroup tests");

	ret = test_no_shared_qgroup(root, sectorsize, nodesize);