Commit 0e34693f authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

btrfs: Make btrfs_trans_release_metadata private to transaction.c 



This function is only ever used in __btrfs_end_transaction and
btrfs_commit_transaction so there is no need to export it via header.
Let's move it closer to where it's used, make it static and remove it
from the header. No functional changes.

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

fs/btrfs/ctree.h

+0 −2
Original line number Diff line number Diff line
@@ -2733,8 +2733,6 @@ void btrfs_delalloc_release_space(struct inode *inode, 
			struct extent_changeset *reserved, u64 start, u64 len);

void btrfs_free_reserved_data_space_noquota(struct inode *inode, u64 start,

					    u64 len);

void btrfs_trans_release_metadata(struct btrfs_trans_handle *trans,

				  struct btrfs_fs_info *fs_info);

void btrfs_trans_release_chunk_metadata(struct btrfs_trans_handle *trans);

int btrfs_orphan_reserve_metadata(struct btrfs_trans_handle *trans,

				  struct btrfs_inode *inode);

fs/btrfs/extent-tree.c

+0 −18
Original line number Diff line number Diff line
@@ -5893,24 +5893,6 @@ static void release_global_block_rsv(struct btrfs_fs_info *fs_info) 
	WARN_ON(fs_info->delayed_block_rsv.reserved > 0);

}



void btrfs_trans_release_metadata(struct btrfs_trans_handle *trans,

				  struct btrfs_fs_info *fs_info)

{

	if (!trans->block_rsv) {

		ASSERT(!trans->bytes_reserved);

		return;

	}



	if (!trans->bytes_reserved)

		return;



	ASSERT(trans->block_rsv == &fs_info->trans_block_rsv);

	trace_btrfs_space_reservation(fs_info, "transaction",

				      trans->transid, trans->bytes_reserved, 0);

	btrfs_block_rsv_release(fs_info, trans->block_rsv,

				trans->bytes_reserved);

	trans->bytes_reserved = 0;

}



/*

 * To be called after all the new block groups attached to the transaction

fs/btrfs/transaction.c

+19 −0
Original line number Diff line number Diff line
@@ -818,6 +818,25 @@ int btrfs_should_end_transaction(struct btrfs_trans_handle *trans) 
	return should_end_transaction(trans);

}



static void btrfs_trans_release_metadata(struct btrfs_trans_handle *trans,

				  struct btrfs_fs_info *fs_info)

{

	if (!trans->block_rsv) {

		ASSERT(!trans->bytes_reserved);

		return;

	}



	if (!trans->bytes_reserved)

		return;



	ASSERT(trans->block_rsv == &fs_info->trans_block_rsv);

	trace_btrfs_space_reservation(fs_info, "transaction",

				      trans->transid, trans->bytes_reserved, 0);

	btrfs_block_rsv_release(fs_info, trans->block_rsv,

				trans->bytes_reserved);

	trans->bytes_reserved = 0;

}



static int __btrfs_end_transaction(struct btrfs_trans_handle *trans,

				   int throttle)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE