Commit 04fb3285 authored by Filipe Manana's avatar Filipe Manana Committed by David Sterba
Browse files

btrfs: collapse should_end_transaction() into btrfs_should_end_transaction() 



The function should_end_transaction() is very short and only has one
caller, which is btrfs_should_end_transaction(). So move the code from
should_end_transaction() into btrfs_should_end_transaction().

Reviewed-by: default avatarJosef Bacik <josef@toxicpanda.com>
Signed-off-by: default avatarFilipe Manana <fdmanana@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent cf5fa929

fs/btrfs/transaction.c

+4 −11
Original line number Original line Diff line number Diff line
@@ -942,16 +942,6 @@ void btrfs_throttle(struct btrfs_fs_info *fs_info) 
	wait_current_trans(fs_info);

	wait_current_trans(fs_info);

}

}





static bool should_end_transaction(struct btrfs_trans_handle *trans)

{

	struct btrfs_fs_info *fs_info = trans->fs_info;



	if (btrfs_check_space_for_delayed_refs(fs_info))

		return true;



	return !!btrfs_block_rsv_check(&fs_info->global_block_rsv, 50);

}



bool btrfs_should_end_transaction(struct btrfs_trans_handle *trans)

bool btrfs_should_end_transaction(struct btrfs_trans_handle *trans)

{

{

	struct btrfs_transaction *cur_trans = trans->transaction;

	struct btrfs_transaction *cur_trans = trans->transaction;
@@ -960,7 +950,10 @@ bool btrfs_should_end_transaction(struct btrfs_trans_handle *trans) 
	    test_bit(BTRFS_DELAYED_REFS_FLUSHING, &cur_trans->delayed_refs.flags))

	    test_bit(BTRFS_DELAYED_REFS_FLUSHING, &cur_trans->delayed_refs.flags))

		return true;

		return true;





	return should_end_transaction(trans);

	if (btrfs_check_space_for_delayed_refs(trans->fs_info))

		return true;



	return !!btrfs_block_rsv_check(&trans->fs_info->global_block_rsv, 50);

}

}





static void btrfs_trans_release_metadata(struct btrfs_trans_handle *trans)

static void btrfs_trans_release_metadata(struct btrfs_trans_handle *trans)