]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
btrfs: Remove chunk_objectid parameter of btrfs_alloc_dev_extent
authorNikolay Borisov <nborisov@suse.com>
Fri, 18 Aug 2017 14:58:22 +0000 (17:58 +0300)
committerDavid Sterba <dsterba@suse.com>
Mon, 21 Aug 2017 16:30:16 +0000 (18:30 +0200)
THe function is always called with chunk_objectid set to
BTRFS_FIRST_CHUNK_TREE_OBJECTID. Let's collapse the parameter in the
function itself. No functional changes.

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/volumes.c

index a37a31ba68431de0e636ad983add085d503ef9e9..63608c5f44877668c7a0a202a39ceb0ee463d007 100644 (file)
@@ -1571,8 +1571,8 @@ out:
 
 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 start, u64 num_bytes)
+                                 u64 chunk_tree, u64 chunk_offset, u64 start,
+                                 u64 num_bytes)
 {
        int ret;
        struct btrfs_path *path;
@@ -1600,7 +1600,8 @@ static int btrfs_alloc_dev_extent(struct btrfs_trans_handle *trans,
        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_objectid(leaf, extent,
+                                           BTRFS_FIRST_CHUNK_TREE_OBJECTID);
        btrfs_set_dev_extent_chunk_offset(leaf, extent, chunk_offset);
 
        btrfs_set_dev_extent_length(leaf, extent, num_bytes);
@@ -4904,7 +4905,6 @@ int btrfs_finish_chunk_alloc(struct btrfs_trans_handle *trans,
                        break;
                ret = btrfs_alloc_dev_extent(trans, device,
                                             chunk_root->root_key.objectid,
-                                            BTRFS_FIRST_CHUNK_TREE_OBJECTID,
                                             chunk_offset, dev_offset,
                                             stripe_size);
                if (ret)