]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
btrfs: Remove fs_info argument from alloc_reserved_tree_block
authorNikolay Borisov <nborisov@suse.com>
Mon, 21 May 2018 09:27:20 +0000 (12:27 +0300)
committerDavid Sterba <dsterba@suse.com>
Tue, 29 May 2018 16:12:53 +0000 (18:12 +0200)
This function already takes a transaction handle which contains a
reference to the fs_info. So use this and remove the extra argument.

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/extent-tree.c

index ccf2690f7ca1ea1f1c6dcf9dea62c01a442540a1..6605fd374f5028cb7be51415818c7945fd87dfe8 100644 (file)
@@ -66,7 +66,6 @@ static int alloc_reserved_file_extent(struct btrfs_trans_handle *trans,
                                      u64 flags, u64 owner, u64 offset,
                                      struct btrfs_key *ins, int ref_mod);
 static int alloc_reserved_tree_block(struct btrfs_trans_handle *trans,
-                                    struct btrfs_fs_info *fs_info,
                                     u64 parent, u64 root_objectid,
                                     u64 flags, struct btrfs_disk_key *key,
                                     int level, struct btrfs_key *ins);
@@ -2461,8 +2460,7 @@ static int run_delayed_tree_ref(struct btrfs_trans_handle *trans,
        }
        if (node->action == BTRFS_ADD_DELAYED_REF && insert_reserved) {
                BUG_ON(!extent_op || !extent_op->update_flags);
-               ret = alloc_reserved_tree_block(trans, fs_info,
-                                               parent, ref_root,
+               ret = alloc_reserved_tree_block(trans, parent, ref_root,
                                                extent_op->flags_to_set,
                                                &extent_op->key,
                                                ref->level, &ins);
@@ -8146,11 +8144,11 @@ static int alloc_reserved_file_extent(struct btrfs_trans_handle *trans,
 }
 
 static int alloc_reserved_tree_block(struct btrfs_trans_handle *trans,
-                                    struct btrfs_fs_info *fs_info,
                                     u64 parent, u64 root_objectid,
                                     u64 flags, struct btrfs_disk_key *key,
                                     int level, struct btrfs_key *ins)
 {
+       struct btrfs_fs_info *fs_info = trans->fs_info;
        int ret;
        struct btrfs_extent_item *extent_item;
        struct btrfs_tree_block_info *block_info;