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

Commit 5a98ec01 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

btrfs: Remove fs_info from btrfs_remove_block_group 



This function is always called with a valid transaction handle from
where we can reference fs_info. No functional changes.

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 e7e02096

fs/btrfs/ctree.h

+1 −2
Original line number Diff line number Diff line
@@ -2723,8 +2723,7 @@ struct btrfs_trans_handle *btrfs_start_trans_remove_block_group( 
				struct btrfs_fs_info *fs_info,

				const u64 chunk_offset);

int btrfs_remove_block_group(struct btrfs_trans_handle *trans,

			     struct btrfs_fs_info *fs_info, u64 group_start,

			     struct extent_map *em);

			     u64 group_start, struct extent_map *em);

void btrfs_delete_unused_bgs(struct btrfs_fs_info *fs_info);

void btrfs_get_block_group_trimming(struct btrfs_block_group_cache *cache);

void btrfs_put_block_group_trimming(struct btrfs_block_group_cache *cache);

fs/btrfs/extent-tree.c

+2 −2
Original line number Diff line number Diff line
@@ -10334,9 +10334,9 @@ static void clear_avail_alloc_bits(struct btrfs_fs_info *fs_info, u64 flags) 
}



int btrfs_remove_block_group(struct btrfs_trans_handle *trans,

			     struct btrfs_fs_info *fs_info, u64 group_start,

			     struct extent_map *em)

			     u64 group_start, struct extent_map *em)

{

	struct btrfs_fs_info *fs_info = trans->fs_info;

	struct btrfs_root *root = fs_info->extent_root;

	struct btrfs_path *path;

	struct btrfs_block_group_cache *block_group;

fs/btrfs/volumes.c

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

	}



	ret = btrfs_remove_block_group(trans, fs_info, chunk_offset, em);

	ret = btrfs_remove_block_group(trans, chunk_offset, em);

	if (ret) {

		btrfs_abort_transaction(trans, ret);

		goto out;