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

Commit 451a2c13 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

btrfs: Remove fs_info from check_system_chunk 



It can be referenced from trans since the function is always called
within a transaction.

Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarQu Wenruo <wqu@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent c216b203

fs/btrfs/ctree.h

+1 −2
Original line number Diff line number Diff line
@@ -2821,8 +2821,7 @@ int btrfs_delayed_refs_qgroup_accounting(struct btrfs_trans_handle *trans, 
int btrfs_start_write_no_snapshotting(struct btrfs_root *root);

void btrfs_end_write_no_snapshotting(struct btrfs_root *root);

void btrfs_wait_for_snapshot_creation(struct btrfs_root *root);

void check_system_chunk(struct btrfs_trans_handle *trans,

			struct btrfs_fs_info *fs_info, const u64 type);

void check_system_chunk(struct btrfs_trans_handle *trans, const u64 type);

u64 add_new_free_space(struct btrfs_block_group_cache *block_group,

		       u64 start, u64 end);

fs/btrfs/extent-tree.c

+4 −4
Original line number Diff line number Diff line
@@ -4527,9 +4527,9 @@ static u64 get_profile_num_devs(struct btrfs_fs_info *fs_info, u64 type) 
 * for allocating a chunk, otherwise if it's false, reserve space necessary for

 * removing a chunk.

 */

void check_system_chunk(struct btrfs_trans_handle *trans,

			struct btrfs_fs_info *fs_info, u64 type)

void check_system_chunk(struct btrfs_trans_handle *trans, u64 type)

{

	struct btrfs_fs_info *fs_info = trans->fs_info;

	struct btrfs_space_info *info;

	u64 left;

	u64 thresh;
@@ -4668,7 +4668,7 @@ static int do_chunk_alloc(struct btrfs_trans_handle *trans, u64 flags, 
	 * Check if we have enough space in SYSTEM chunk because we may need

	 * to update devices.

	 */

	check_system_chunk(trans, fs_info, flags);

	check_system_chunk(trans, flags);



	ret = btrfs_alloc_chunk(trans, flags);

	trans->allocating_chunk = false;
@@ -9493,7 +9493,7 @@ int btrfs_inc_block_group_ro(struct btrfs_fs_info *fs_info, 
	if (cache->flags & BTRFS_BLOCK_GROUP_SYSTEM) {

		alloc_flags = update_block_group_flags(fs_info, cache->flags);

		mutex_lock(&fs_info->chunk_mutex);

		check_system_chunk(trans, fs_info, alloc_flags);

		check_system_chunk(trans, alloc_flags);

		mutex_unlock(&fs_info->chunk_mutex);

	}

	mutex_unlock(&fs_info->ro_block_group_mutex);

fs/btrfs/volumes.c

+1 −1
Original line number Diff line number Diff line
@@ -2829,7 +2829,7 @@ int btrfs_remove_chunk(struct btrfs_trans_handle *trans, 
	}

	map = em->map_lookup;

	mutex_lock(&fs_info->chunk_mutex);

	check_system_chunk(trans, fs_info, map->type);

	check_system_chunk(trans, map->type);

	mutex_unlock(&fs_info->chunk_mutex);



	/*