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

Commit 97aff912 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

btrfs: Remove fs_info from btrfs_finish_chunk_alloc 



It can be referenced from the passed transaction handle.

Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarLu Fengqi <lufq.fnst@cn.fujitsu.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent f4208794

fs/btrfs/extent-tree.c

+2 −4
Original line number Diff line number Diff line
@@ -10022,8 +10022,7 @@ void btrfs_create_pending_block_groups(struct btrfs_trans_handle *trans) 
					sizeof(item));

		if (ret)

			btrfs_abort_transaction(trans, ret);

		ret = btrfs_finish_chunk_alloc(trans, fs_info, key.objectid,

					       key.offset);

		ret = btrfs_finish_chunk_alloc(trans, key.objectid, key.offset);

		if (ret)

			btrfs_abort_transaction(trans, ret);

		add_block_group_free_space(trans, block_group);
@@ -10594,8 +10593,7 @@ void btrfs_delete_unused_bgs(struct btrfs_fs_info *fs_info) 
		 * Btrfs_remove_chunk will abort the transaction if things go

		 * horribly wrong.

		 */

		ret = btrfs_remove_chunk(trans, fs_info,

					 block_group->key.objectid);

		ret = btrfs_remove_chunk(trans, block_group->key.objectid);



		if (ret) {

			if (trimming)

fs/btrfs/volumes.c

+5 −5
Original line number Diff line number Diff line
@@ -2716,9 +2716,9 @@ static struct extent_map *get_chunk_map(struct btrfs_fs_info *fs_info, 
	return em;

}



int btrfs_remove_chunk(struct btrfs_trans_handle *trans,

		       struct btrfs_fs_info *fs_info, u64 chunk_offset)

int btrfs_remove_chunk(struct btrfs_trans_handle *trans, u64 chunk_offset)

{

	struct btrfs_fs_info *fs_info = trans->fs_info;

	struct extent_map *em;

	struct map_lookup *map;

	u64 dev_extent_len = 0;
@@ -2858,7 +2858,7 @@ static int btrfs_relocate_chunk(struct btrfs_fs_info *fs_info, u64 chunk_offset) 
	 * step two, delete the device extents and the

	 * chunk tree entries

	 */

	ret = btrfs_remove_chunk(trans, fs_info, chunk_offset);

	ret = btrfs_remove_chunk(trans, chunk_offset);

	btrfs_end_transaction(trans);

	return ret;

}
@@ -4842,9 +4842,9 @@ static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans, 
}



int btrfs_finish_chunk_alloc(struct btrfs_trans_handle *trans,

				struct btrfs_fs_info *fs_info,

			     u64 chunk_offset, u64 chunk_size)

{

	struct btrfs_fs_info *fs_info = trans->fs_info;

	struct btrfs_root *extent_root = fs_info->extent_root;

	struct btrfs_root *chunk_root = fs_info->chunk_root;

	struct btrfs_key key;

fs/btrfs/volumes.h

+2 −4
Original line number Diff line number Diff line
@@ -462,10 +462,8 @@ int btrfs_is_parity_mirror(struct btrfs_fs_info *fs_info, 
unsigned long btrfs_full_stripe_len(struct btrfs_fs_info *fs_info,

				    u64 logical);

int btrfs_finish_chunk_alloc(struct btrfs_trans_handle *trans,

				struct btrfs_fs_info *fs_info,

			     u64 chunk_offset, u64 chunk_size);

int btrfs_remove_chunk(struct btrfs_trans_handle *trans,

		       struct btrfs_fs_info *fs_info, u64 chunk_offset);

int btrfs_remove_chunk(struct btrfs_trans_handle *trans, u64 chunk_offset);



static inline void btrfs_dev_stat_inc(struct btrfs_device *dev,

				      int index)