OSDN Git Service

btrfs: Drop fs_info parameter from btrfs_finish_extent_commit
authorNikolay Borisov <nborisov@suse.com>
Thu, 15 Mar 2018 14:00:26 +0000 (16:00 +0200)
committerDavid Sterba <dsterba@suse.com>
Fri, 30 Mar 2018 23:41:11 +0000 (01:41 +0200)
It's provided by the transaction handle.

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

index b0573cd..03be51d 100644 (file)
@@ -2682,8 +2682,7 @@ int btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info,
 int btrfs_free_and_pin_reserved_extent(struct btrfs_fs_info *fs_info,
                                       u64 start, u64 len);
 void btrfs_prepare_extent_commit(struct btrfs_fs_info *fs_info);
-int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans,
-                              struct btrfs_fs_info *fs_info);
+int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans);
 int btrfs_inc_extent_ref(struct btrfs_trans_handle *trans,
                         struct btrfs_root *root,
                         u64 bytenr, u64 num_bytes, u64 parent,
index 7b1c7c0..9100a53 100644 (file)
@@ -6770,9 +6770,9 @@ static int unpin_extent_range(struct btrfs_fs_info *fs_info,
        return 0;
 }
 
-int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans,
-                              struct btrfs_fs_info *fs_info)
+int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans)
 {
+       struct btrfs_fs_info *fs_info = trans->fs_info;
        struct btrfs_block_group_cache *block_group, *tmp;
        struct list_head *deleted_bgs;
        struct extent_io_tree *unpin;
index 7c81588..15f6541 100644 (file)
@@ -2268,7 +2268,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans)
        if (ret)
                goto scrub_continue;
 
-       btrfs_finish_extent_commit(trans, fs_info);
+       btrfs_finish_extent_commit(trans);
 
        if (test_bit(BTRFS_TRANS_HAVE_FREE_BGS, &cur_trans->flags))
                btrfs_clear_space_info_full(fs_info);