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

btrfs: qgroup: Drop root parameter from btrfs_qgroup_trace_subtree 



The fs_info can be fetched from the transaction handle directly.

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

fs/btrfs/extent-tree.c

+1 −1
Original line number Diff line number Diff line
@@ -8660,7 +8660,7 @@ skip: 
		}



		if (need_account) {

			ret = btrfs_qgroup_trace_subtree(trans, root, next,

			ret = btrfs_qgroup_trace_subtree(trans, next,

							 generation, level - 1);

			if (ret) {

				btrfs_err_rl(fs_info,

fs/btrfs/qgroup.c

+1 −2
Original line number Diff line number Diff line
@@ -1714,11 +1714,10 @@ static int adjust_slots_upwards(struct btrfs_path *path, int root_level) 
}



int btrfs_qgroup_trace_subtree(struct btrfs_trans_handle *trans,

			       struct btrfs_root *root,

			       struct extent_buffer *root_eb,

			       u64 root_gen, int root_level)

{

	struct btrfs_fs_info *fs_info = root->fs_info;

	struct btrfs_fs_info *fs_info = trans->fs_info;

	int ret = 0;

	int level;

	struct extent_buffer *eb = root_eb;

fs/btrfs/qgroup.h

+0 −1
Original line number Diff line number Diff line
@@ -234,7 +234,6 @@ int btrfs_qgroup_trace_leaf_items(struct btrfs_trans_handle *trans, 
 * Return <0 for error(ENOMEM or tree search error)

 */

int btrfs_qgroup_trace_subtree(struct btrfs_trans_handle *trans,

			       struct btrfs_root *root,

			       struct extent_buffer *root_eb,

			       u64 root_gen, int root_level);

int

fs/btrfs/relocation.c

+2 −3
Original line number Diff line number Diff line
@@ -1879,13 +1879,12 @@ again: 
		 *    and tree block numbers, if current trans doesn't free

		 *    data reloc tree inode.

		 */

		ret = btrfs_qgroup_trace_subtree(trans, src, parent,

		ret = btrfs_qgroup_trace_subtree(trans, parent,

				btrfs_header_generation(parent),

				btrfs_header_level(parent));

		if (ret < 0)

			break;

		ret = btrfs_qgroup_trace_subtree(trans, dest,

				path->nodes[level],

		ret = btrfs_qgroup_trace_subtree(trans, path->nodes[level],

				btrfs_header_generation(path->nodes[level]),

				btrfs_header_level(path->nodes[level]));

		if (ret < 0)

CRA Git | Maintained and supported by SUSTech CRA and CCSE