btrfs-progs: volumes: Remove unnecessary parameters when allocating device extent
authorQu Wenruo <wqu@suse.com>
Wed, 3 Jan 2018 07:13:05 +0000 (15:13 +0800)
committerDavid Sterba <dsterba@suse.com>
Wed, 31 Jan 2018 14:14:02 +0000 (15:14 +0100)
@chunk_tree and @chunk_objectid of device extent is fixed to
BTRFS_CHUNK_TREE_OBJECTID and BTRFS_FIRST_CHUNK_TREE_OBJECTID
respectively.

There is no need to pass them as parameter explicitly.

Signed-off-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Su Yue <suy.fnst@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
volumes.c

index a9ce0bf..fea60b2 100644 (file)
--- a/volumes.c
+++ b/volumes.c
@@ -459,9 +459,8 @@ static int find_free_dev_extent(struct btrfs_device *device, u64 num_bytes,
 
 static int btrfs_alloc_dev_extent(struct btrfs_trans_handle *trans,
                                  struct btrfs_device *device,
-                                 u64 chunk_tree, u64 chunk_objectid,
-                                 u64 chunk_offset,
-                                 u64 num_bytes, u64 *start, int convert)
+                                 u64 chunk_offset, u64 num_bytes, u64 *start,
+                                 int convert)
 {
        int ret;
        struct btrfs_path *path;
@@ -494,8 +493,9 @@ static int btrfs_alloc_dev_extent(struct btrfs_trans_handle *trans,
        leaf = path->nodes[0];
        extent = btrfs_item_ptr(leaf, path->slots[0],
                                struct btrfs_dev_extent);
-       btrfs_set_dev_extent_chunk_tree(leaf, extent, chunk_tree);
-       btrfs_set_dev_extent_chunk_objectid(leaf, extent, chunk_objectid);
+       btrfs_set_dev_extent_chunk_tree(leaf, extent, BTRFS_CHUNK_TREE_OBJECTID);
+       btrfs_set_dev_extent_chunk_objectid(leaf, extent,
+                                           BTRFS_FIRST_CHUNK_TREE_OBJECTID);
        btrfs_set_dev_extent_chunk_offset(leaf, extent, chunk_offset);
 
        write_extent_buffer(leaf, root->fs_info->chunk_tree_uuid,
@@ -1032,9 +1032,7 @@ again:
                    (index == num_stripes - 1))
                        list_move_tail(&device->dev_list, dev_list);
 
-               ret = btrfs_alloc_dev_extent(trans, device,
-                            info->chunk_root->root_key.objectid,
-                            BTRFS_FIRST_CHUNK_TREE_OBJECTID, key.offset,
+               ret = btrfs_alloc_dev_extent(trans, device, key.offset,
                             calc_size, &dev_offset, 0);
                if (ret < 0)
                        goto out_chunk_map;
@@ -1169,9 +1167,7 @@ int btrfs_alloc_data_chunk(struct btrfs_trans_handle *trans,
        while (index < num_stripes) {
                struct btrfs_stripe *stripe;
 
-               ret = btrfs_alloc_dev_extent(trans, device,
-                            info->chunk_root->root_key.objectid,
-                            BTRFS_FIRST_CHUNK_TREE_OBJECTID, key.offset,
+               ret = btrfs_alloc_dev_extent(trans, device, key.offset,
                             calc_size, &dev_offset, convert);
                BUG_ON(ret);