btrfs: Remove chunk_objectid argument from btrfs_make_block_group

btrfs_make_block_group is always called with chunk_objectid set to
BTRFS_FIRST_CHUNK_TREE_OBJECTID. There's no reason why this behavior will
change anytime soon, so let's remove the argument and decrease the cognitive
load when reading the code path. No functional change

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

3 files changed, 5 insertions, 8 deletions

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 02edcddbcc9c..ca087ad5ac48 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -2676,8 +2676,7 @@ int btrfs_read_block_groups(struct btrfs_fs_info *info);
 int btrfs_can_relocate(struct btrfs_fs_info *fs_info, u64 bytenr);
 int btrfs_make_block_group(struct btrfs_trans_handle *trans,
                            struct btrfs_fs_info *fs_info, u64 bytes_used,
-                           u64 type, u64 chunk_objectid, u64 chunk_offset,
-                           u64 size);
+                           u64 type, u64 chunk_offset, u64 size);
 struct btrfs_trans_handle *btrfs_start_trans_remove_block_group(
                                 struct btrfs_fs_info *fs_info,
                                 const u64 chunk_offset);
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 6a8da7c19182..1a80f6e58296 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -10180,8 +10180,7 @@ next:
 
 int btrfs_make_block_group(struct btrfs_trans_handle *trans,
                            struct btrfs_fs_info *fs_info, u64 bytes_used,
-                           u64 type, u64 chunk_objectid, u64 chunk_offset,
-                           u64 size)
+                           u64 type, u64 chunk_offset, u64 size)
 {
         struct btrfs_block_group_cache *cache;
         int ret;
@@ -10193,7 +10192,8 @@ int btrfs_make_block_group(struct btrfs_trans_handle *trans,
                 return -ENOMEM;
 
         btrfs_set_block_group_used(&cache->item, bytes_used);
-        btrfs_set_block_group_chunk_objectid(&cache->item, chunk_objectid);
+        btrfs_set_block_group_chunk_objectid(&cache->item,
+                                             BTRFS_FIRST_CHUNK_TREE_OBJECTID);
         btrfs_set_block_group_flags(&cache->item, type);
 
         cache->flags = type;
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 3561397a0c29..1df1044e9008 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -4826,9 +4826,7 @@ static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
                 goto error;
         }
 
-        ret = btrfs_make_block_group(trans, info, 0, type,
-                                     BTRFS_FIRST_CHUNK_TREE_OBJECTID,
-                                     start, num_bytes);
+        ret = btrfs_make_block_group(trans, info, 0, type, start, num_bytes);
         if (ret)
                 goto error_del_extent;