Commit 63f018be authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

btrfs: Remove __ prefix from btrfs_block_rsv_release 



Currently the non-prefixed version is a simple wrapper used to hide
the 4th argument of the prefixed version. This doesn't bring much value
in practice and only makes the code harder to follow by adding another
level of indirection. Rectify this by removing the __ prefix and
have only one public function to release bytes from a block reservation.
No semantic changes.

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

fs/btrfs/block-rsv.c

+6 −5
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ void btrfs_free_block_rsv(struct btrfs_fs_info *fs_info, 
{

	if (!rsv)

		return;

	btrfs_block_rsv_release(fs_info, rsv, (u64)-1);

	btrfs_block_rsv_release(fs_info, rsv, (u64)-1, NULL);

	kfree(rsv);

}
@@ -270,9 +270,9 @@ int btrfs_block_rsv_refill(struct btrfs_root *root, 
	return ret;

}



u64 __btrfs_block_rsv_release(struct btrfs_fs_info *fs_info,

			      struct btrfs_block_rsv *block_rsv,

			      u64 num_bytes, u64 *qgroup_to_release)

u64 btrfs_block_rsv_release(struct btrfs_fs_info *fs_info,

			    struct btrfs_block_rsv *block_rsv, u64 num_bytes,

			    u64 *qgroup_to_release)

{

	struct btrfs_block_rsv *global_rsv = &fs_info->global_block_rsv;

	struct btrfs_block_rsv *delayed_rsv = &fs_info->delayed_refs_rsv;
@@ -436,7 +436,8 @@ void btrfs_init_global_block_rsv(struct btrfs_fs_info *fs_info) 


void btrfs_release_global_block_rsv(struct btrfs_fs_info *fs_info)

{

	btrfs_block_rsv_release(fs_info, &fs_info->global_block_rsv, (u64)-1);

	btrfs_block_rsv_release(fs_info, &fs_info->global_block_rsv, (u64)-1,

				NULL);

	WARN_ON(fs_info->trans_block_rsv.size > 0);

	WARN_ON(fs_info->trans_block_rsv.reserved > 0);

	WARN_ON(fs_info->chunk_block_rsv.size > 0);

fs/btrfs/block-rsv.h

+2 −10
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ int btrfs_cond_migrate_bytes(struct btrfs_fs_info *fs_info, 
			     int min_factor);

void btrfs_block_rsv_add_bytes(struct btrfs_block_rsv *block_rsv,

			       u64 num_bytes, bool update_size);

u64 __btrfs_block_rsv_release(struct btrfs_fs_info *fs_info,

u64 btrfs_block_rsv_release(struct btrfs_fs_info *fs_info,

			      struct btrfs_block_rsv *block_rsv,

			      u64 num_bytes, u64 *qgroup_to_release);

void btrfs_update_global_block_rsv(struct btrfs_fs_info *fs_info);
@@ -82,20 +82,12 @@ void btrfs_release_global_block_rsv(struct btrfs_fs_info *fs_info); 
struct btrfs_block_rsv *btrfs_use_block_rsv(struct btrfs_trans_handle *trans,

					    struct btrfs_root *root,

					    u32 blocksize);



static inline void btrfs_block_rsv_release(struct btrfs_fs_info *fs_info,

					   struct btrfs_block_rsv *block_rsv,

					   u64 num_bytes)

{

	__btrfs_block_rsv_release(fs_info, block_rsv, num_bytes, NULL);

}



static inline void btrfs_unuse_block_rsv(struct btrfs_fs_info *fs_info,

					 struct btrfs_block_rsv *block_rsv,

					 u32 blocksize)

{

	btrfs_block_rsv_add_bytes(block_rsv, blocksize, false);

	btrfs_block_rsv_release(fs_info, block_rsv, 0);

	btrfs_block_rsv_release(fs_info, block_rsv, 0, NULL);

}



#endif /* BTRFS_BLOCK_RSV_H */

fs/btrfs/delalloc-space.c

+2 −2
Original line number Diff line number Diff line
@@ -330,7 +330,7 @@ static void btrfs_inode_rsv_release(struct btrfs_inode *inode, bool qgroup_free) 
	 * are releasing 0 bytes, and then we'll just get the reservation over

	 * the size free'd.

	 */

	released = __btrfs_block_rsv_release(fs_info, block_rsv, 0,

	released = btrfs_block_rsv_release(fs_info, block_rsv, 0,

					   &qgroup_to_release);

	if (released > 0)

		trace_btrfs_space_reservation(fs_info, "delalloc",

fs/btrfs/delayed-inode.c

+2 −4
Original line number Diff line number Diff line
@@ -595,8 +595,7 @@ static void btrfs_delayed_item_release_metadata(struct btrfs_root *root, 
	trace_btrfs_space_reservation(fs_info, "delayed_item",

				      item->key.objectid, item->bytes_reserved,

				      0);

	btrfs_block_rsv_release(fs_info, rsv,

				item->bytes_reserved);

	btrfs_block_rsv_release(fs_info, rsv, item->bytes_reserved, NULL);

}



static int btrfs_delayed_inode_reserve_metadata(
@@ -677,8 +676,7 @@ static void btrfs_delayed_inode_release_metadata(struct btrfs_fs_info *fs_info, 
	rsv = &fs_info->delayed_block_rsv;

	trace_btrfs_space_reservation(fs_info, "delayed_inode",

				      node->inode_id, node->bytes_reserved, 0);

	btrfs_block_rsv_release(fs_info, rsv,

				node->bytes_reserved);

	btrfs_block_rsv_release(fs_info, rsv, node->bytes_reserved, NULL);

	if (qgroup_free)

		btrfs_qgroup_free_meta_prealloc(node->root,

				node->bytes_reserved);

fs/btrfs/delayed-ref.c

+1 −2
Original line number Diff line number Diff line
@@ -82,8 +82,7 @@ void btrfs_delayed_refs_rsv_release(struct btrfs_fs_info *fs_info, int 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,

					     NULL);

	released = btrfs_block_rsv_release(fs_info, block_rsv, num_bytes, NULL);

	if (released)

		trace_btrfs_space_reservation(fs_info, "delayed_refs_rsv",

					      0, released, 0);

CRA Git | Maintained and supported by SUSTech CRA and CCSE