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

btrfs: rename the btrfs_calc_*_metadata_size helpers 



btrfs_calc_trunc_metadata_size differs from trans_metadata_size in that
it doesn't take into account any splitting at the levels, because
truncate will never split nodes.  However truncate _and_ changing will
never split nodes, so rename btrfs_calc_trunc_metadata_size to
btrfs_calc_metadata_size.  Also btrfs_calc_trans_metadata_size is purely
for inserting items, so rename this to btrfs_calc_insert_metadata_size.
Making these clearer will help when I start using them differently in
upcoming patches.

Reviewed-by: default avatarNikolay Borisov <nborisov@suse.com>
Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 0785a9aa

fs/btrfs/block-group.c

+2 −2
Original line number Diff line number Diff line
@@ -3015,8 +3015,8 @@ void check_system_chunk(struct btrfs_trans_handle *trans, u64 type) 
	num_devs = get_profile_num_devs(fs_info, type);



	/* num_devs device items to update and 1 chunk item to add or remove */

	thresh = btrfs_calc_trunc_metadata_size(fs_info, num_devs) +

		btrfs_calc_trans_metadata_size(fs_info, 1);

	thresh = btrfs_calc_metadata_size(fs_info, num_devs) +

		btrfs_calc_insert_metadata_size(fs_info, 1);



	if (left < thresh && btrfs_test_opt(fs_info, ENOSPC_DEBUG)) {

		btrfs_info(fs_info, "left=%llu, need=%llu, flags=%llu",

fs/btrfs/ctree.h

+9 −5
Original line number Diff line number Diff line
@@ -2451,17 +2451,21 @@ u64 hash_extent_data_ref(u64 root_objectid, u64 owner, u64 offset); 


u64 btrfs_csum_bytes_to_leaves(struct btrfs_fs_info *fs_info, u64 csum_bytes);



static inline u64 btrfs_calc_trans_metadata_size(struct btrfs_fs_info *fs_info,

/*

 * Use this if we would be adding new items, as we could split nodes as we cow

 * down the tree.

 */

static inline u64 btrfs_calc_insert_metadata_size(struct btrfs_fs_info *fs_info,

						  unsigned num_items)

{

	return (u64)fs_info->nodesize * BTRFS_MAX_LEVEL * 2 * num_items;

}



/*

 * Doing a truncate won't result in new nodes or leaves, just what we need for

 * COW.

 * Doing a truncate or a modification won't result in new nodes or leaves, just

 * what we need for COW.

 */

static inline u64 btrfs_calc_trunc_metadata_size(struct btrfs_fs_info *fs_info,

static inline u64 btrfs_calc_metadata_size(struct btrfs_fs_info *fs_info,

						 unsigned num_items)

{

	return (u64)fs_info->nodesize * BTRFS_MAX_LEVEL * num_items;

fs/btrfs/delalloc-space.c

+4 −4
Original line number Diff line number Diff line
@@ -256,11 +256,11 @@ static void btrfs_calculate_inode_block_rsv_size(struct btrfs_fs_info *fs_info, 
	lockdep_assert_held(&inode->lock);

	outstanding_extents = inode->outstanding_extents;

	if (outstanding_extents)

		reserve_size = btrfs_calc_trans_metadata_size(fs_info,

		reserve_size = btrfs_calc_insert_metadata_size(fs_info,

						outstanding_extents + 1);

	csum_leaves = btrfs_csum_bytes_to_leaves(fs_info,

						 inode->csum_bytes);

	reserve_size += btrfs_calc_trans_metadata_size(fs_info,

	reserve_size += btrfs_calc_insert_metadata_size(fs_info,

							csum_leaves);

	/*

	 * For qgroup rsv, the calculation is very simple:
@@ -284,7 +284,7 @@ static void calc_inode_reservations(struct btrfs_fs_info *fs_info, 
	u64 csum_leaves = btrfs_csum_bytes_to_leaves(fs_info, num_bytes);



	/* We add one for the inode update at finish ordered time */

	*meta_reserve = btrfs_calc_trans_metadata_size(fs_info,

	*meta_reserve = btrfs_calc_insert_metadata_size(fs_info,

						nr_extents + csum_leaves + 1);

	*qgroup_reserve = nr_extents * fs_info->nodesize;

}

fs/btrfs/delayed-inode.c

+2 −2
Original line number Diff line number Diff line
@@ -558,7 +558,7 @@ static int btrfs_delayed_item_reserve_metadata(struct btrfs_trans_handle *trans, 
	src_rsv = trans->block_rsv;

	dst_rsv = &fs_info->delayed_block_rsv;



	num_bytes = btrfs_calc_trans_metadata_size(fs_info, 1);

	num_bytes = btrfs_calc_insert_metadata_size(fs_info, 1);



	/*

	 * Here we migrate space rsv from transaction rsv, since have already
@@ -612,7 +612,7 @@ static int btrfs_delayed_inode_reserve_metadata( 
	src_rsv = trans->block_rsv;

	dst_rsv = &fs_info->delayed_block_rsv;



	num_bytes = btrfs_calc_trans_metadata_size(fs_info, 1);

	num_bytes = btrfs_calc_insert_metadata_size(fs_info, 1);



	/*

	 * btrfs_dirty_inode will update the inode under btrfs_join_transaction

fs/btrfs/delayed-ref.c

+4 −4
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ int btrfs_should_throttle_delayed_refs(struct btrfs_trans_handle *trans) 
void btrfs_delayed_refs_rsv_release(struct btrfs_fs_info *fs_info, int nr)

{

	struct btrfs_block_rsv *block_rsv = &fs_info->delayed_refs_rsv;

	u64 num_bytes = btrfs_calc_trans_metadata_size(fs_info, nr);

	u64 num_bytes = btrfs_calc_insert_metadata_size(fs_info, nr);

	u64 released = 0;



	released = __btrfs_block_rsv_release(fs_info, block_rsv, num_bytes,
@@ -105,7 +105,7 @@ void btrfs_update_delayed_refs_rsv(struct btrfs_trans_handle *trans) 
	if (!trans->delayed_ref_updates)

		return;



	num_bytes = btrfs_calc_trans_metadata_size(fs_info,

	num_bytes = btrfs_calc_insert_metadata_size(fs_info,

						    trans->delayed_ref_updates);

	spin_lock(&delayed_rsv->lock);

	delayed_rsv->size += num_bytes;
@@ -174,7 +174,7 @@ int btrfs_delayed_refs_rsv_refill(struct btrfs_fs_info *fs_info, 
				  enum btrfs_reserve_flush_enum flush)

{

	struct btrfs_block_rsv *block_rsv = &fs_info->delayed_refs_rsv;

	u64 limit = btrfs_calc_trans_metadata_size(fs_info, 1);

	u64 limit = btrfs_calc_insert_metadata_size(fs_info, 1);

	u64 num_bytes = 0;

	int ret = -ENOSPC;

CRA Git | Maintained and supported by SUSTech CRA and CCSE