Commit 8696d760 authored by Lu Fengqi's avatar Lu Fengqi Committed by David Sterba
Browse files

btrfs: qgroup: Drop fs_info parameter from btrfs_qgroup_account_extent 



It can be fetched from the transaction handle.

Signed-off-by: default avatarLu Fengqi <lufq.fnst@cn.fujitsu.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent deb40627

fs/btrfs/qgroup.c

+10 −10
Original line number Diff line number Diff line
@@ -2038,12 +2038,11 @@ static int maybe_fs_roots(struct ulist *roots) 
	return is_fstree(unode->val);

}



int

btrfs_qgroup_account_extent(struct btrfs_trans_handle *trans,

			    struct btrfs_fs_info *fs_info,

			    u64 bytenr, u64 num_bytes,

			    struct ulist *old_roots, struct ulist *new_roots)

int btrfs_qgroup_account_extent(struct btrfs_trans_handle *trans, u64 bytenr,

				u64 num_bytes, struct ulist *old_roots,

				struct ulist *new_roots)

{

	struct btrfs_fs_info *fs_info = trans->fs_info;

	struct ulist *qgroups = NULL;

	struct ulist *tmp = NULL;

	u64 seq;
@@ -2173,9 +2172,10 @@ int btrfs_qgroup_account_extents(struct btrfs_trans_handle *trans) 
				ulist_del(record->old_roots, qgroup_to_skip,

					  0);

			}

			ret = btrfs_qgroup_account_extent(trans, fs_info,

					record->bytenr, record->num_bytes,

					record->old_roots, new_roots);

			ret = btrfs_qgroup_account_extent(trans, record->bytenr,

							  record->num_bytes,

							  record->old_roots,

							  new_roots);

			record->old_roots = NULL;

			new_roots = NULL;

		}
@@ -2711,8 +2711,8 @@ qgroup_rescan_leaf(struct btrfs_fs_info *fs_info, struct btrfs_path *path, 
		if (ret < 0)

			goto out;

		/* For rescan, just pass old_roots as NULL */

		ret = btrfs_qgroup_account_extent(trans, fs_info,

				found.objectid, num_bytes, NULL, roots);

		ret = btrfs_qgroup_account_extent(trans, found.objectid,

						  num_bytes, NULL, roots);

		if (ret < 0)

			goto out;

	}

fs/btrfs/qgroup.h

+3 −5
Original line number Diff line number Diff line
@@ -236,11 +236,9 @@ int btrfs_qgroup_trace_leaf_items(struct btrfs_trans_handle *trans, 
int btrfs_qgroup_trace_subtree(struct btrfs_trans_handle *trans,

			       struct extent_buffer *root_eb,

			       u64 root_gen, int root_level);

int

btrfs_qgroup_account_extent(struct btrfs_trans_handle *trans,

			    struct btrfs_fs_info *fs_info,

			    u64 bytenr, u64 num_bytes,

			    struct ulist *old_roots, struct ulist *new_roots);

int btrfs_qgroup_account_extent(struct btrfs_trans_handle *trans, u64 bytenr,

				u64 num_bytes, struct ulist *old_roots,

				struct ulist *new_roots);

int btrfs_qgroup_account_extents(struct btrfs_trans_handle *trans);

int btrfs_run_qgroups(struct btrfs_trans_handle *trans,

		      struct btrfs_fs_info *fs_info);

fs/btrfs/tests/qgroup-tests.c

+10 −10
Original line number Diff line number Diff line
@@ -249,8 +249,8 @@ static int test_no_shared_qgroup(struct btrfs_root *root, 
		return ret;

	}



	ret = btrfs_qgroup_account_extent(&trans, fs_info, nodesize,

					  nodesize, old_roots, new_roots);

	ret = btrfs_qgroup_account_extent(&trans, nodesize, nodesize, old_roots,

					  new_roots);

	if (ret) {

		test_err("couldn't account space for a qgroup %d", ret);

		return ret;
@@ -285,8 +285,8 @@ static int test_no_shared_qgroup(struct btrfs_root *root, 
		return ret;

	}



	ret = btrfs_qgroup_account_extent(&trans, fs_info, nodesize,

					  nodesize, old_roots, new_roots);

	ret = btrfs_qgroup_account_extent(&trans, nodesize, nodesize, old_roots,

					  new_roots);

	if (ret) {

		test_err("couldn't account space for a qgroup %d", ret);

		return -EINVAL;
@@ -350,8 +350,8 @@ static int test_multiple_refs(struct btrfs_root *root, 
		return ret;

	}



	ret = btrfs_qgroup_account_extent(&trans, fs_info, nodesize,

					  nodesize, old_roots, new_roots);

	ret = btrfs_qgroup_account_extent(&trans, nodesize, nodesize, old_roots,

					  new_roots);

	if (ret) {

		test_err("couldn't account space for a qgroup %d", ret);

		return ret;
@@ -385,8 +385,8 @@ static int test_multiple_refs(struct btrfs_root *root, 
		return ret;

	}



	ret = btrfs_qgroup_account_extent(&trans, fs_info, nodesize,

					  nodesize, old_roots, new_roots);

	ret = btrfs_qgroup_account_extent(&trans, nodesize, nodesize, old_roots,

					  new_roots);

	if (ret) {

		test_err("couldn't account space for a qgroup %d", ret);

		return ret;
@@ -426,8 +426,8 @@ static int test_multiple_refs(struct btrfs_root *root, 
		return ret;

	}



	ret = btrfs_qgroup_account_extent(&trans, fs_info, nodesize,

					  nodesize, old_roots, new_roots);

	ret = btrfs_qgroup_account_extent(&trans, nodesize, nodesize, old_roots,

					  new_roots);

	if (ret) {

		test_err("couldn't account space for a qgroup %d", ret);

		return ret;