[PATCH 15/19] btrfs: qgroup: Drop root parameter from btrfs_qgroup_trace_subtree

[Lu Fengqi]

The fs_info can be fetched from the transaction handle directly.

Signed-off-by: Lu Fengqi <lufq.f...@cn.fujitsu.com>
---
 fs/btrfs/extent-tree.c | 2 +-
 fs/btrfs/qgroup.c      | 3 +--
 fs/btrfs/qgroup.h      | 1 -
 fs/btrfs/relocation.c  | 5 ++---
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 51da902a0ad7..4f19bdca3214 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -8660,7 +8660,7 @@ static noinline int do_walk_down(struct 
btrfs_trans_handle *trans,
                }
 
                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,
diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
index 5cce45c30735..92d757e3a2f5 100644
--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
@@ -1715,11 +1715,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;
diff --git a/fs/btrfs/qgroup.h b/fs/btrfs/qgroup.h
index 9d434a01d467..b8f15ce6c83d 100644
--- a/fs/btrfs/qgroup.h
+++ b/fs/btrfs/qgroup.h
@@ -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
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index b98d7a594542..d6bcf558789e 100644
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -1879,13 +1879,12 @@ int replace_path(struct btrfs_trans_handle *trans,
                 *    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)
-- 
2.18.0



--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html