|
@@ -530,11 +530,11 @@ void btrfs_free_qgroup_config(struct btrfs_fs_info *fs_info)
|
|
|
fs_info->qgroup_ulist = NULL;
|
|
|
}
|
|
|
|
|
|
-static int add_qgroup_relation_item(struct btrfs_trans_handle *trans,
|
|
|
- struct btrfs_root *quota_root,
|
|
|
- u64 src, u64 dst)
|
|
|
+static int add_qgroup_relation_item(struct btrfs_trans_handle *trans, u64 src,
|
|
|
+ u64 dst)
|
|
|
{
|
|
|
int ret;
|
|
|
+ struct btrfs_root *quota_root = trans->fs_info->quota_root;
|
|
|
struct btrfs_path *path;
|
|
|
struct btrfs_key key;
|
|
|
|
|
@@ -1274,11 +1274,11 @@ int btrfs_add_qgroup_relation(struct btrfs_trans_handle *trans,
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- ret = add_qgroup_relation_item(trans, quota_root, src, dst);
|
|
|
+ ret = add_qgroup_relation_item(trans, src, dst);
|
|
|
if (ret)
|
|
|
goto out;
|
|
|
|
|
|
- ret = add_qgroup_relation_item(trans, quota_root, dst, src);
|
|
|
+ ret = add_qgroup_relation_item(trans, dst, src);
|
|
|
if (ret) {
|
|
|
del_qgroup_relation_item(trans, quota_root, src, dst);
|
|
|
goto out;
|
|
@@ -2295,12 +2295,12 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans,
|
|
|
for (i = 0; i < inherit->num_qgroups; ++i, ++i_qgroups) {
|
|
|
if (*i_qgroups == 0)
|
|
|
continue;
|
|
|
- ret = add_qgroup_relation_item(trans, quota_root,
|
|
|
- objectid, *i_qgroups);
|
|
|
+ ret = add_qgroup_relation_item(trans, objectid,
|
|
|
+ *i_qgroups);
|
|
|
if (ret && ret != -EEXIST)
|
|
|
goto out;
|
|
|
- ret = add_qgroup_relation_item(trans, quota_root,
|
|
|
- *i_qgroups, objectid);
|
|
|
+ ret = add_qgroup_relation_item(trans, *i_qgroups,
|
|
|
+ objectid);
|
|
|
if (ret && ret != -EEXIST)
|
|
|
goto out;
|
|
|
}
|