Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03477d94 authored by Dongsheng Yang's avatar Dongsheng Yang Committed by Chris Mason
Browse files

btrfs: qgroup: fix limit args override whole limit struct 



btrfs_limit_group use arg limit to override the old qgroup_limit of
corresponding qgroup. However, we should override part of old qgroup_limit
according to the bit which has been set in arg limit.

Signed-off-by: default avatarFan Chengniang <fancn.fnst@cn.fujitsu.com>
Signed-off-by: default avatarDongsheng Yang <yangds.fnst@cn.fujitsu.com>
Signed-off-by: default avatarChris Mason <clm@fb.com>
parent d3001ed3

fs/btrfs/qgroup.c

+10 −5
Original line number Diff line number Diff line
@@ -1185,11 +1185,16 @@ int btrfs_limit_qgroup(struct btrfs_trans_handle *trans, 
	}



	spin_lock(&fs_info->qgroup_lock);

	qgroup->lim_flags = limit->flags;

	if (limit->flags & BTRFS_QGROUP_LIMIT_MAX_RFER)

		qgroup->max_rfer = limit->max_rfer;

	if (limit->flags & BTRFS_QGROUP_LIMIT_MAX_EXCL)

		qgroup->max_excl = limit->max_excl;

	if (limit->flags & BTRFS_QGROUP_LIMIT_RSV_RFER)

		qgroup->rsv_rfer = limit->rsv_rfer;

	if (limit->flags & BTRFS_QGROUP_LIMIT_RSV_EXCL)

		qgroup->rsv_excl = limit->rsv_excl;

	qgroup->lim_flags |= limit->flags;



	spin_unlock(&fs_info->qgroup_lock);



	ret = update_qgroup_limit_item(trans, quota_root, qgroup);