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

Commit fb6dea26 authored by Josef Bacik's avatar Josef Bacik Committed by David Sterba
Browse files

btrfs: migrate btrfs_trans_release_chunk_metadata 



Move this into transaction.c with the rest of the transaction related
code.

Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 6ef03deb

fs/btrfs/ctree.h

+0 −1
Original line number Diff line number Diff line
@@ -2768,7 +2768,6 @@ void btrfs_delalloc_release_space(struct inode *inode, 
				  u64 start, u64 len, bool qgroup_free);

void btrfs_free_reserved_data_space_noquota(struct inode *inode, u64 start,

					    u64 len);

void btrfs_trans_release_chunk_metadata(struct btrfs_trans_handle *trans);

int btrfs_subvolume_reserve_metadata(struct btrfs_root *root,

				     struct btrfs_block_rsv *rsv,

				     int nitems, bool use_global_rsv);

fs/btrfs/extent-tree.c

+0 −18
Original line number Diff line number Diff line
@@ -4339,24 +4339,6 @@ static void btrfs_inode_rsv_release(struct btrfs_inode *inode, bool qgroup_free) 
						   qgroup_to_release);

}



/*

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

 * handle have been created (btrfs_create_pending_block_groups()).

 */

void btrfs_trans_release_chunk_metadata(struct btrfs_trans_handle *trans)

{

	struct btrfs_fs_info *fs_info = trans->fs_info;



	if (!trans->chunk_bytes_reserved)

		return;



	WARN_ON_ONCE(!list_empty(&trans->new_bgs));



	btrfs_block_rsv_release(fs_info, &fs_info->chunk_block_rsv,

				trans->chunk_bytes_reserved);

	trans->chunk_bytes_reserved = 0;

}



/*

 * btrfs_subvolume_reserve_metadata() - reserve space for subvolume operation

 * root: the root of the parent directory

fs/btrfs/transaction.c

+18 −0
Original line number Diff line number Diff line
@@ -128,6 +128,24 @@ static inline int extwriter_counter_read(struct btrfs_transaction *trans) 
	return atomic_read(&trans->num_extwriters);

}



/*

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

 * handle have been created (btrfs_create_pending_block_groups()).

 */

void btrfs_trans_release_chunk_metadata(struct btrfs_trans_handle *trans)

{

	struct btrfs_fs_info *fs_info = trans->fs_info;



	if (!trans->chunk_bytes_reserved)

		return;



	WARN_ON_ONCE(!list_empty(&trans->new_bgs));



	btrfs_block_rsv_release(fs_info, &fs_info->chunk_block_rsv,

				trans->chunk_bytes_reserved);

	trans->chunk_bytes_reserved = 0;

}



/*

 * either allocate a new transaction or hop into the existing one

 */

fs/btrfs/transaction.h

+1 −0
Original line number Diff line number Diff line
@@ -224,5 +224,6 @@ void btrfs_put_transaction(struct btrfs_transaction *transaction); 
void btrfs_apply_pending_changes(struct btrfs_fs_info *fs_info);

void btrfs_add_dropped_root(struct btrfs_trans_handle *trans,

			    struct btrfs_root *root);

void btrfs_trans_release_chunk_metadata(struct btrfs_trans_handle *trans);



#endif