Skip to content

Commit a1840b5

Browse files
kdavekdave
committed
btrfs: use helper to set ulist aux from a qgroup
We have a nice helper to do proper casting of a qgroup to a ulist aux value. And several places that could make use of it. Signed-off-by: David Sterba <dsterba@suse.com>
1 parent 0b78877 commit a1840b5

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

‎fs/btrfs/qgroup.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2434,7 +2434,7 @@ static int qgroup_reserve(struct btrfs_root *root, u64 num_bytes, bool enforce,
24342434
*/
24352435
ulist_reinit(fs_info->qgroup_ulist);
24362436
ret = ulist_add(fs_info->qgroup_ulist, qgroup->qgroupid,
2437-
(uintptr_t)qgroup, GFP_ATOMIC);
2437+
qgroup_to_aux(qgroup), GFP_ATOMIC);
24382438
if (ret < 0)
24392439
goto out;
24402440
ULIST_ITER_INIT(&uiter);
@@ -2452,7 +2452,7 @@ static int qgroup_reserve(struct btrfs_root *root, u64 num_bytes, bool enforce,
24522452
list_for_each_entry(glist, &qg->groups, next_group) {
24532453
ret = ulist_add(fs_info->qgroup_ulist,
24542454
glist->group->qgroupid,
2455-
(uintptr_t)glist->group, GFP_ATOMIC);
2455+
qgroup_to_aux(glist->group), GFP_ATOMIC);
24562456
if (ret < 0)
24572457
goto out;
24582458
}
@@ -2524,7 +2524,7 @@ void btrfs_qgroup_free_refroot(struct btrfs_fs_info *fs_info,
25242524

25252525
ulist_reinit(fs_info->qgroup_ulist);
25262526
ret = ulist_add(fs_info->qgroup_ulist, qgroup->qgroupid,
2527-
(uintptr_t)qgroup, GFP_ATOMIC);
2527+
qgroup_to_aux(qgroup), GFP_ATOMIC);
25282528
if (ret < 0)
25292529
goto out;
25302530
ULIST_ITER_INIT(&uiter);
@@ -2540,7 +2540,7 @@ void btrfs_qgroup_free_refroot(struct btrfs_fs_info *fs_info,
25402540
list_for_each_entry(glist, &qg->groups, next_group) {
25412541
ret = ulist_add(fs_info->qgroup_ulist,
25422542
glist->group->qgroupid,
2543-
(uintptr_t)glist->group, GFP_ATOMIC);
2543+
qgroup_to_aux(glist->group), GFP_ATOMIC);
25442544
if (ret < 0)
25452545
goto out;
25462546
}
@@ -3186,7 +3186,7 @@ static void qgroup_convert_meta(struct btrfs_fs_info *fs_info, u64 ref_root,
31863186
goto out;
31873187
ulist_reinit(fs_info->qgroup_ulist);
31883188
ret = ulist_add(fs_info->qgroup_ulist, qgroup->qgroupid,
3189-
(uintptr_t)qgroup, GFP_ATOMIC);
3189+
qgroup_to_aux(qgroup), GFP_ATOMIC);
31903190
if (ret < 0)
31913191
goto out;
31923192
ULIST_ITER_INIT(&uiter);
@@ -3203,7 +3203,7 @@ static void qgroup_convert_meta(struct btrfs_fs_info *fs_info, u64 ref_root,
32033203
list_for_each_entry(glist, &qg->groups, next_group) {
32043204
ret = ulist_add(fs_info->qgroup_ulist,
32053205
glist->group->qgroupid,
3206-
(uintptr_t)glist->group, GFP_ATOMIC);
3206+
qgroup_to_aux(glist->group), GFP_ATOMIC);
32073207
if (ret < 0)
32083208
goto out;
32093209
}

0 commit comments

Comments
 (0)