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

Commit 6c686b35 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

btrfs: Remove fs_info argument from btrfs_create_pending_block_groups 



It can be referenced from the passed transaciton so no point in
passing it as function argument. No functional changes.

Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent dc60c525

fs/btrfs/ctree.h

+1 −2
Original line number Diff line number Diff line
@@ -2697,8 +2697,7 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans, 
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);

void btrfs_create_pending_block_groups(struct btrfs_trans_handle *trans,

				       struct btrfs_fs_info *fs_info);

void btrfs_create_pending_block_groups(struct btrfs_trans_handle *trans);

u64 btrfs_data_alloc_profile(struct btrfs_fs_info *fs_info);

u64 btrfs_metadata_alloc_profile(struct btrfs_fs_info *fs_info);

u64 btrfs_system_alloc_profile(struct btrfs_fs_info *fs_info);

fs/btrfs/extent-tree.c

+5 −5
Original line number Diff line number Diff line
@@ -3086,7 +3086,7 @@ int btrfs_run_delayed_refs(struct btrfs_trans_handle *trans, 


	if (run_all) {

		if (!list_empty(&trans->new_bgs))

			btrfs_create_pending_block_groups(trans, fs_info);

			btrfs_create_pending_block_groups(trans);



		spin_lock(&delayed_refs->lock);

		node = rb_first(&delayed_refs->href_root);
@@ -3686,7 +3686,7 @@ int btrfs_start_dirty_block_groups(struct btrfs_trans_handle *trans, 
	 * make sure all the block groups on our dirty list actually

	 * exist

	 */

	btrfs_create_pending_block_groups(trans, fs_info);

	btrfs_create_pending_block_groups(trans);



	if (!path) {

		path = btrfs_alloc_path();
@@ -4706,7 +4706,7 @@ static int do_chunk_alloc(struct btrfs_trans_handle *trans, 
	 */

	if (trans->can_flush_pending_bgs &&

	    trans->chunk_bytes_reserved >= (u64)SZ_2M) {

		btrfs_create_pending_block_groups(trans, fs_info);

		btrfs_create_pending_block_groups(trans);

		btrfs_trans_release_chunk_metadata(trans);

	}

	return ret;
@@ -10151,9 +10151,9 @@ int btrfs_read_block_groups(struct btrfs_fs_info *info) 
	return ret;

}



void btrfs_create_pending_block_groups(struct btrfs_trans_handle *trans,

				       struct btrfs_fs_info *fs_info)

void btrfs_create_pending_block_groups(struct btrfs_trans_handle *trans)

{

	struct btrfs_fs_info *fs_info = trans->fs_info;

	struct btrfs_block_group_cache *block_group, *tmp;

	struct btrfs_root *extent_root = fs_info->extent_root;

	struct btrfs_block_group_item item;

fs/btrfs/transaction.c

+3 −3
Original line number Diff line number Diff line
@@ -860,7 +860,7 @@ static int __btrfs_end_transaction(struct btrfs_trans_handle *trans, 
	trans->block_rsv = NULL;



	if (!list_empty(&trans->new_bgs))

		btrfs_create_pending_block_groups(trans, info);

		btrfs_create_pending_block_groups(trans);



	trans->delayed_ref_updates = 0;

	if (!trans->sync) {
@@ -881,7 +881,7 @@ static int __btrfs_end_transaction(struct btrfs_trans_handle *trans, 
	trans->block_rsv = NULL;



	if (!list_empty(&trans->new_bgs))

		btrfs_create_pending_block_groups(trans, info);

		btrfs_create_pending_block_groups(trans);



	btrfs_trans_release_chunk_metadata(trans);
@@ -1984,7 +1984,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans) 
	smp_wmb();



	if (!list_empty(&trans->new_bgs))

		btrfs_create_pending_block_groups(trans, fs_info);

		btrfs_create_pending_block_groups(trans);



	ret = btrfs_run_delayed_refs(trans, fs_info, 0);

	if (ret) {