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

btrfs: qgroup: update qgroup in memory at the same time when we update it in btree. 



When we call btrfs_qgroup_inherit() with BTRFS_QGROUP_INHERIT_SET_LIMITS,
btrfs will update the limit info of qgroup in btree but forget to update
the qgroup in rbtree at the same time. It obviousely will cause an inconsistency.

This patch fix it by updating the rbtree at the same time.

Signed-off-by: default avatarDongsheng Yang <yangds.fnst@cn.fujitsu.com>
Signed-off-by: default avatarChris Mason <clm@fb.com>
parent 3eeb4d59

fs/btrfs/qgroup.c

+17 −11
Original line number Diff line number Diff line
@@ -2230,17 +2230,6 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans, 
	if (ret)

		goto out;



	if (inherit && inherit->flags & BTRFS_QGROUP_INHERIT_SET_LIMITS) {

		ret = update_qgroup_limit_item(trans, quota_root, objectid,

					       inherit->lim.flags,

					       inherit->lim.max_rfer,

					       inherit->lim.max_excl,

					       inherit->lim.rsv_rfer,

					       inherit->lim.rsv_excl);

		if (ret)

			goto out;

	}



	if (srcid) {

		struct btrfs_root *srcroot;

		struct btrfs_key srckey;
@@ -2286,6 +2275,23 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans, 
		goto unlock;

	}



	if (inherit && inherit->flags & BTRFS_QGROUP_INHERIT_SET_LIMITS) {

		ret = update_qgroup_limit_item(trans, quota_root, objectid,

					       inherit->lim.flags,

					       inherit->lim.max_rfer,

					       inherit->lim.max_excl,

					       inherit->lim.rsv_rfer,

					       inherit->lim.rsv_excl);

		if (ret)

			goto unlock;



		dstgroup->lim_flags = inherit->lim.flags;

		dstgroup->max_rfer = inherit->lim.max_rfer;

		dstgroup->max_excl = inherit->lim.max_excl;

		dstgroup->rsv_rfer = inherit->lim.rsv_rfer;

		dstgroup->rsv_excl = inherit->lim.rsv_excl;

	}



	if (srcid) {

		srcgroup = find_qgroup_rb(fs_info, srcid);

		if (!srcgroup)

CRA Git | Maintained and supported by SUSTech CRA and CCSE