btrfs: qgroup: Drop fs_info parameter from btrfs_qgroup_account_extent

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/qgroup.c b/fs/btrfs/qgroup.c
index 0b43e9e2a71e6a56d43684e4c8e7ba94b786dbff..5ac57fc3fa4b5e9fab36bb66146f1d675e1d7c14 100644 (file)
--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
@@ -2038,12 +2038,11 @@ static int maybe_fs_roots(struct ulist *roots)
        return is_fstree(unode->val);
 }
 
-int
-btrfs_qgroup_account_extent(struct btrfs_trans_handle *trans,
-                           struct btrfs_fs_info *fs_info,
-                           u64 bytenr, u64 num_bytes,
-                           struct ulist *old_roots, struct ulist *new_roots)
+int btrfs_qgroup_account_extent(struct btrfs_trans_handle *trans, u64 bytenr,
+                               u64 num_bytes, struct ulist *old_roots,
+                               struct ulist *new_roots)
 {
+       struct btrfs_fs_info *fs_info = trans->fs_info;
        struct ulist *qgroups = NULL;
        struct ulist *tmp = NULL;
        u64 seq;
@@ -2173,9 +2172,10 @@ int btrfs_qgroup_account_extents(struct btrfs_trans_handle *trans)
                                ulist_del(record->old_roots, qgroup_to_skip,
                                          0);
                        }
-                       ret = btrfs_qgroup_account_extent(trans, fs_info,
-                                       record->bytenr, record->num_bytes,
-                                       record->old_roots, new_roots);
+                       ret = btrfs_qgroup_account_extent(trans, record->bytenr,
+                                                         record->num_bytes,
+                                                         record->old_roots,
+                                                         new_roots);
                        record->old_roots = NULL;
                        new_roots = NULL;
                }
@@ -2711,8 +2711,8 @@ qgroup_rescan_leaf(struct btrfs_fs_info *fs_info, struct btrfs_path *path,
                if (ret < 0)
                        goto out;
                /* For rescan, just pass old_roots as NULL */
-               ret = btrfs_qgroup_account_extent(trans, fs_info,
-                               found.objectid, num_bytes, NULL, roots);
+               ret = btrfs_qgroup_account_extent(trans, found.objectid,
+                                                 num_bytes, NULL, roots);
                if (ret < 0)
                        goto out;
        }

diff --git a/fs/btrfs/qgroup.h b/fs/btrfs/qgroup.h
index b8f15ce6c83d76465b95aa17bbef36e74a9dd615..61b723b1e4d8510dee4c8968b574f9d6eca62c7b 100644 (file)
--- a/fs/btrfs/qgroup.h
+++ b/fs/btrfs/qgroup.h
@@ -236,11 +236,9 @@ int btrfs_qgroup_trace_leaf_items(struct btrfs_trans_handle *trans,
 int btrfs_qgroup_trace_subtree(struct btrfs_trans_handle *trans,
                               struct extent_buffer *root_eb,
                               u64 root_gen, int root_level);
-int
-btrfs_qgroup_account_extent(struct btrfs_trans_handle *trans,
-                           struct btrfs_fs_info *fs_info,
-                           u64 bytenr, u64 num_bytes,
-                           struct ulist *old_roots, struct ulist *new_roots);
+int btrfs_qgroup_account_extent(struct btrfs_trans_handle *trans, u64 bytenr,
+                               u64 num_bytes, struct ulist *old_roots,
+                               struct ulist *new_roots);
 int btrfs_qgroup_account_extents(struct btrfs_trans_handle *trans);
 int btrfs_run_qgroups(struct btrfs_trans_handle *trans,
                      struct btrfs_fs_info *fs_info);

diff --git a/fs/btrfs/tests/qgroup-tests.c b/fs/btrfs/tests/qgroup-tests.c
index b5e332d45d374cac68216df9117d8ee1a0af7e17..412b910b04cc0712fa64cf6d1ea00b30d7e9a2e6 100644 (file)
--- a/fs/btrfs/tests/qgroup-tests.c
+++ b/fs/btrfs/tests/qgroup-tests.c
@@ -249,8 +249,8 @@ static int test_no_shared_qgroup(struct btrfs_root *root,
                return ret;
        }
 
-       ret = btrfs_qgroup_account_extent(&trans, fs_info, nodesize,
-                                         nodesize, old_roots, new_roots);
+       ret = btrfs_qgroup_account_extent(&trans, nodesize, nodesize, old_roots,
+                                         new_roots);
        if (ret) {
                test_err("couldn't account space for a qgroup %d", ret);
                return ret;
@@ -285,8 +285,8 @@ static int test_no_shared_qgroup(struct btrfs_root *root,
                return ret;
        }
 
-       ret = btrfs_qgroup_account_extent(&trans, fs_info, nodesize,
-                                         nodesize, old_roots, new_roots);
+       ret = btrfs_qgroup_account_extent(&trans, nodesize, nodesize, old_roots,
+                                         new_roots);
        if (ret) {
                test_err("couldn't account space for a qgroup %d", ret);
                return -EINVAL;
@@ -350,8 +350,8 @@ static int test_multiple_refs(struct btrfs_root *root,
                return ret;
        }
 
-       ret = btrfs_qgroup_account_extent(&trans, fs_info, nodesize,
-                                         nodesize, old_roots, new_roots);
+       ret = btrfs_qgroup_account_extent(&trans, nodesize, nodesize, old_roots,
+                                         new_roots);
        if (ret) {
                test_err("couldn't account space for a qgroup %d", ret);
                return ret;
@@ -385,8 +385,8 @@ static int test_multiple_refs(struct btrfs_root *root,
                return ret;
        }
 
-       ret = btrfs_qgroup_account_extent(&trans, fs_info, nodesize,
-                                         nodesize, old_roots, new_roots);
+       ret = btrfs_qgroup_account_extent(&trans, nodesize, nodesize, old_roots,
+                                         new_roots);
        if (ret) {
                test_err("couldn't account space for a qgroup %d", ret);
                return ret;
@@ -426,8 +426,8 @@ static int test_multiple_refs(struct btrfs_root *root,
                return ret;
        }
 
-       ret = btrfs_qgroup_account_extent(&trans, fs_info, nodesize,
-                                         nodesize, old_roots, new_roots);
+       ret = btrfs_qgroup_account_extent(&trans, nodesize, nodesize, old_roots,
+                                         new_roots);
        if (ret) {
                test_err("couldn't account space for a qgroup %d", ret);
                return ret;