Unverified Commit 2470c2ce authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10752 btrfs: qgroup: fix quota root leak after quota disable failure 

Merge Pull Request from: @ci-robot 
 
PR sync from: Wang Zhaolong <wangzhaolong1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/J2ZBIUCXVPVK3W5BMDOQN2QNMU4J3NII/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAGEN9 
 
Link:https://gitee.com/openeuler/kernel/pulls/10752

 

Reviewed-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 13ac3d01 e11247a9

fs/btrfs/qgroup.c

+2 −2
Original line number Diff line number Diff line
@@ -1197,7 +1197,7 @@ int btrfs_quota_enable(struct btrfs_fs_info *fs_info) 


int btrfs_quota_disable(struct btrfs_fs_info *fs_info)

{

	struct btrfs_root *quota_root;

	struct btrfs_root *quota_root = NULL;

	struct btrfs_trans_handle *trans = NULL;

	int ret = 0;
@@ -1290,9 +1290,9 @@ int btrfs_quota_disable(struct btrfs_fs_info *fs_info) 
	btrfs_tree_unlock(quota_root->node);

	btrfs_free_tree_block(trans, quota_root, quota_root->node, 0, 1);



	btrfs_put_root(quota_root);



out:

	btrfs_put_root(quota_root);

	mutex_unlock(&fs_info->qgroup_ioctl_lock);

	if (ret && trans)

		btrfs_end_transaction(trans);