btrfs: qgroup: Drop fs_info parameter from btrfs_qgroup_trace_leaf_items

It can be fetched from the transaction handle.

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 ced26ba8d39262257b3324f1c8355a563a8fa490..51da902a0ad7cf880c4690f6a9794bce7fb72ed5 100644 (file)
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -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.",

diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
index d1e8b485191285adb9770cb754c7f0c303c78107..11a23b17a432edb996b2b54f779bbec3f2a6ee26 100644 (file)
--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
@@ -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,8 +1803,8 @@ walk_down:
                }
 
                if (level == 0) {
-                       ret = btrfs_qgroup_trace_leaf_items(trans,fs_info,
-                                                          path->nodes[level]);
+                       ret = btrfs_qgroup_trace_leaf_items(trans,
+                                                           path->nodes[level]);
                        if (ret)
                                goto out;
 

diff --git a/fs/btrfs/qgroup.h b/fs/btrfs/qgroup.h
index 0215dc0b1710a832d4fa6818ed208fe6100df20b..9d434a01d467cb351fcb6c60e85b669f29d62c25 100644 (file)
--- a/fs/btrfs/qgroup.h
+++ b/fs/btrfs/qgroup.h
@@ -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