btrfs: qgroup: Drop root parameter from btrfs_qgroup_trace_subtree

The fs_info can be fetched from the transaction handle directly.

Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 51da902a0ad7cf880c4690f6a9794bce7fb72ed5..4f19bdca3214dea23e4a6cbfa7139c918c23d68d 100644 (file)
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -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,

diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
index 11a23b17a432edb996b2b54f779bbec3f2a6ee26..0b43e9e2a71e6a56d43684e4c8e7ba94b786dbff 100644 (file)
--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
@@ -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;

diff --git a/fs/btrfs/qgroup.h b/fs/btrfs/qgroup.h
index 9d434a01d467cb351fcb6c60e85b669f29d62c25..b8f15ce6c83d76465b95aa17bbef36e74a9dd615 100644 (file)
--- 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 b98d7a5945427c949600688af824fe4b8c9e77ea..d6bcf558789e6c05e1fc78567329d1bab1a103b7 100644 (file)
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -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)