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

btrfs: qgroup: Drop fs_info parameter from btrfs_qgroup_trace_leaf_items 



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 a95f3aaf

fs/btrfs/extent-tree.c

+1 −1
Original line number Diff line number Diff line
@@ -8760,7 +8760,7 @@ static noinline int walk_up_proc(struct btrfs_trans_handle *trans, 
			else

				ret = btrfs_dec_ref(trans, root, eb, 0);

			BUG_ON(ret); /* -ENOMEM */

			ret = btrfs_qgroup_trace_leaf_items(trans, fs_info, eb);

			ret = btrfs_qgroup_trace_leaf_items(trans, eb);

			if (ret) {

				btrfs_err_rl(fs_info,

					     "error %d accounting leaf items. Quota is out of sync, rescan required.",

fs/btrfs/qgroup.c

+4 −4
Original line number Diff line number Diff line
@@ -1611,9 +1611,9 @@ int btrfs_qgroup_trace_extent(struct btrfs_trans_handle *trans, u64 bytenr, 
}



int btrfs_qgroup_trace_leaf_items(struct btrfs_trans_handle *trans,

				  struct btrfs_fs_info *fs_info,

				  struct extent_buffer *eb)

{

	struct btrfs_fs_info *fs_info = trans->fs_info;

	int nr = btrfs_header_nritems(eb);

	int i, extent_type, ret;

	struct btrfs_key key;
@@ -1737,7 +1737,7 @@ int btrfs_qgroup_trace_subtree(struct btrfs_trans_handle *trans, 
	}



	if (root_level == 0) {

		ret = btrfs_qgroup_trace_leaf_items(trans, fs_info, root_eb);

		ret = btrfs_qgroup_trace_leaf_items(trans, root_eb);

		goto out;

	}
@@ -1803,7 +1803,7 @@ int btrfs_qgroup_trace_subtree(struct btrfs_trans_handle *trans, 
		}



		if (level == 0) {

			ret = btrfs_qgroup_trace_leaf_items(trans,fs_info,

			ret = btrfs_qgroup_trace_leaf_items(trans,

							    path->nodes[level]);

			if (ret)

				goto out;

fs/btrfs/qgroup.h

+0 −1
Original line number Diff line number Diff line
@@ -222,7 +222,6 @@ int btrfs_qgroup_trace_extent(struct btrfs_trans_handle *trans, u64 bytenr, 
 * Return <0 for error(ENOMEM)

 */

int btrfs_qgroup_trace_leaf_items(struct btrfs_trans_handle *trans,

				  struct btrfs_fs_info *fs_info,

				  struct extent_buffer *eb);

/*

 * Inform qgroup to trace a whole subtree, including all its child tree