Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ca00afb authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

btrfs: Remove chunk_objectid parameter of btrfs_alloc_dev_extent 



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: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 1cd5447e

fs/btrfs/volumes.c

+4 −4
Original line number Diff line number Diff line
@@ -1571,8 +1571,8 @@ static int btrfs_free_dev_extent(struct btrfs_trans_handle *trans, 


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)