btrfs: Remove fs_info argument from add_new_free_space

This function also takes a btrfs_block_group_cache which contains a
referene to the fs_info. So use that 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>

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 27aa9b5..954bfb5 100644 (file)
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -2832,7 +2832,7 @@ void btrfs_wait_for_snapshot_creation(struct btrfs_root *root);
 void check_system_chunk(struct btrfs_trans_handle *trans,
                        struct btrfs_fs_info *fs_info, const u64 type);
 u64 add_new_free_space(struct btrfs_block_group_cache *block_group,
-                      struct btrfs_fs_info *info, u64 start, u64 end);
+                      u64 start, u64 end);
 
 /* ctree.c */
 int btrfs_bin_search(struct extent_buffer *eb, const struct btrfs_key *key,

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index c4b5b49..4d4e064 100644 (file)
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -343,8 +343,9 @@ static void fragment_free_space(struct btrfs_block_group_cache *block_group)
  * since their free space will be released as soon as the transaction commits.
  */
 u64 add_new_free_space(struct btrfs_block_group_cache *block_group,
-                      struct btrfs_fs_info *info, u64 start, u64 end)
+                      u64 start, u64 end)
 {
+       struct btrfs_fs_info *info = block_group->fs_info;
        u64 extent_start, extent_end, size, total_added = 0;
        int ret;
 
@@ -489,8 +490,7 @@ next:
 
                if (key.type == BTRFS_EXTENT_ITEM_KEY ||
                    key.type == BTRFS_METADATA_ITEM_KEY) {
-                       total_found += add_new_free_space(block_group,
-                                                         fs_info, last,
+                       total_found += add_new_free_space(block_group, last,
                                                          key.objectid);
                        if (key.type == BTRFS_METADATA_ITEM_KEY)
                                last = key.objectid +
@@ -508,7 +508,7 @@ next:
        }
        ret = 0;
 
-       total_found += add_new_free_space(block_group, fs_info, last,
+       total_found += add_new_free_space(block_group, last,
                                          block_group->key.objectid +
                                          block_group->key.offset);
        caching_ctl->progress = (u64)-1;
@@ -10162,8 +10162,7 @@ int btrfs_read_block_groups(struct btrfs_fs_info *info)
                } else if (btrfs_block_group_used(&cache->item) == 0) {
                        cache->last_byte_to_unpin = (u64)-1;
                        cache->cached = BTRFS_CACHE_FINISHED;
-                       add_new_free_space(cache, info,
-                                          found_key.objectid,
+                       add_new_free_space(cache, found_key.objectid,
                                           found_key.objectid +
                                           found_key.offset);
                        free_excluded_extents(info, cache);
@@ -10300,7 +10299,7 @@ int btrfs_make_block_group(struct btrfs_trans_handle *trans,
                return ret;
        }
 
-       add_new_free_space(cache, fs_info, chunk_offset, chunk_offset + size);
+       add_new_free_space(cache, chunk_offset, chunk_offset + size);
 
        free_excluded_extents(fs_info, cache);
 

diff --git a/fs/btrfs/free-space-tree.c b/fs/btrfs/free-space-tree.c
index 4b687e2..ecf07fd 100644 (file)
--- a/fs/btrfs/free-space-tree.c
+++ b/fs/btrfs/free-space-tree.c
@@ -1438,7 +1438,6 @@ static int load_free_space_bitmaps(struct btrfs_caching_control *caching_ctl,
                                extent_start = offset;
                        } else if (prev_bit == 1 && bit == 0) {
                                total_found += add_new_free_space(block_group,
-                                                                 fs_info,
                                                                  extent_start,
                                                                  offset);
                                if (total_found > CACHING_CTL_WAKE_UP) {
@@ -1452,8 +1451,8 @@ static int load_free_space_bitmaps(struct btrfs_caching_control *caching_ctl,
                }
        }
        if (prev_bit == 1) {
-               total_found += add_new_free_space(block_group, fs_info,
-                                                 extent_start, end);
+               total_found += add_new_free_space(block_group, extent_start,
+                                                 end);
                extent_count++;
        }
 
@@ -1510,8 +1509,7 @@ static int load_free_space_extents(struct btrfs_caching_control *caching_ctl,
 
                caching_ctl->progress = key.objectid;
 
-               total_found += add_new_free_space(block_group, fs_info,
-                                                 key.objectid,
+               total_found += add_new_free_space(block_group, key.objectid,
                                                  key.objectid + key.offset);
                if (total_found > CACHING_CTL_WAKE_UP) {
                        total_found = 0;