]> git.hungrycats.org Git - linux/commitdiff
btrfs: get fs_info from eb in tree_mod_log_eb_copy
authorDavid Sterba <dsterba@suse.com>
Wed, 20 Mar 2019 13:22:04 +0000 (14:22 +0100)
committerZygo Blaxell <ce3g8jdj@umail.furryterror.org>
Sun, 9 Feb 2020 20:40:29 +0000 (15:40 -0500)
We can read fs_info from extent buffer and can drop it from the
parameters.

Signed-off-by: David Sterba <dsterba@suse.com>
(cherry picked from commit ed874f0db89724d0af1b4793fb518f640f333b0b)

fs/btrfs/ctree.c

index 581227dca3f1c0e7437aa6b90985ad99b985ad49..5d9f3cb2053953d2b119225f7d57889fc435d963 100644 (file)
@@ -715,11 +715,11 @@ tree_mod_log_search(struct btrfs_fs_info *fs_info, u64 start, u64 min_seq)
        return __tree_mod_log_search(fs_info, start, min_seq, 0);
 }
 
-static noinline int
-tree_mod_log_eb_copy(struct btrfs_fs_info *fs_info, struct extent_buffer *dst,
+static noinline int tree_mod_log_eb_copy(struct extent_buffer *dst,
                     struct extent_buffer *src, unsigned long dst_offset,
                     unsigned long src_offset, int nr_items)
 {
+       struct btrfs_fs_info *fs_info = dst->fs_info;
        int ret = 0;
        struct tree_mod_elem **tm_list = NULL;
        struct tree_mod_elem **tm_list_add, **tm_list_rem;
@@ -3252,8 +3252,7 @@ static int push_node_left(struct btrfs_trans_handle *trans,
        } else
                push_items = min(src_nritems - 8, push_items);
 
-       ret = tree_mod_log_eb_copy(fs_info, dst, src, dst_nritems, 0,
-                                  push_items);
+       ret = tree_mod_log_eb_copy(dst, src, dst_nritems, 0, push_items);
        if (ret) {
                btrfs_abort_transaction(trans, ret);
                return ret;
@@ -3328,8 +3327,8 @@ static int balance_node_right(struct btrfs_trans_handle *trans,
                                      (dst_nritems) *
                                      sizeof(struct btrfs_key_ptr));
 
-       ret = tree_mod_log_eb_copy(fs_info, dst, src, 0,
-                                  src_nritems - push_items, push_items);
+       ret = tree_mod_log_eb_copy(dst, src, 0, src_nritems - push_items,
+                                  push_items);
        if (ret) {
                btrfs_abort_transaction(trans, ret);
                return ret;
@@ -3514,7 +3513,7 @@ static noinline int split_node(struct btrfs_trans_handle *trans,
        root_add_used(root, fs_info->nodesize);
        ASSERT(btrfs_header_level(c) == level);
 
-       ret = tree_mod_log_eb_copy(fs_info, split, c, 0, mid, c_nritems - mid);
+       ret = tree_mod_log_eb_copy(split, c, 0, mid, c_nritems - mid);
        if (ret) {
                btrfs_abort_transaction(trans, ret);
                return ret;