Commit 09134450 authored by Qu Wenruo's avatar Qu Wenruo Committed by David Sterba
Browse files

btrfs: qgroup: use qgroup_iterator in qgroup_convert_meta() 



With the new qgroup_iterator_add() and qgroup_iterator_clean(), we can
get rid of the ulist and its GFP_ATOMIC memory allocation.

Reviewed-by: default avatarBoris Burkov <boris@bur.io>
Signed-off-by: default avatarQu Wenruo <wqu@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 25152cb7

fs/btrfs/qgroup.c

+10 −22
Original line number Diff line number Diff line
@@ -4086,9 +4086,7 @@ static void qgroup_convert_meta(struct btrfs_fs_info *fs_info, u64 ref_root, 
				int num_bytes)

{

	struct btrfs_qgroup *qgroup;

	struct ulist_node *unode;

	struct ulist_iterator uiter;

	int ret = 0;

	LIST_HEAD(qgroup_list);



	if (num_bytes == 0)

		return;
@@ -4099,31 +4097,21 @@ static void qgroup_convert_meta(struct btrfs_fs_info *fs_info, u64 ref_root, 
	qgroup = find_qgroup_rb(fs_info, ref_root);

	if (!qgroup)

		goto out;

	ulist_reinit(fs_info->qgroup_ulist);

	ret = ulist_add(fs_info->qgroup_ulist, qgroup->qgroupid,

		       qgroup_to_aux(qgroup), GFP_ATOMIC);

	if (ret < 0)

		goto out;

	ULIST_ITER_INIT(&uiter);

	while ((unode = ulist_next(fs_info->qgroup_ulist, &uiter))) {

		struct btrfs_qgroup *qg;

		struct btrfs_qgroup_list *glist;



		qg = unode_aux_to_qgroup(unode);

	qgroup_iterator_add(&qgroup_list, qgroup);

	list_for_each_entry(qgroup, &qgroup_list, iterator) {

		struct btrfs_qgroup_list *glist;



		qgroup_rsv_release(fs_info, qg, num_bytes,

		qgroup_rsv_release(fs_info, qgroup, num_bytes,

				BTRFS_QGROUP_RSV_META_PREALLOC);

		qgroup_rsv_add(fs_info, qg, num_bytes,

		qgroup_rsv_add(fs_info, qgroup, num_bytes,

				BTRFS_QGROUP_RSV_META_PERTRANS);

		list_for_each_entry(glist, &qg->groups, next_group) {

			ret = ulist_add(fs_info->qgroup_ulist,

					glist->group->qgroupid,

					qgroup_to_aux(glist->group), GFP_ATOMIC);

			if (ret < 0)

				goto out;

		}



		list_for_each_entry(glist, &qgroup->groups, next_group)

			qgroup_iterator_add(&qgroup_list, glist->group);

	}

out:

	qgroup_iterator_clean(&qgroup_list);

	spin_unlock(&fs_info->qgroup_lock);

}