diff mbox series

[06/10] btrfs: reduce arguments of helpers space accounting root item

Message ID ec9f787e9b36be2e8240734d74f1fff4f68c78c9.1694126893.git.dsterba@suse.com (mailing list archive)
State New, archived
Headers show
Series Cleanups and struct packing | expand

Commit Message

David Sterba Sept. 7, 2023, 11:09 p.m. UTC 
There are two helpers to increase used bytes of root items that add or
subtract one node size, we don't need to pass the argument for that.
Rename the function so it matches the root item member that gets
changed.

Signed-off-by: David Sterba <dsterba@suse.com>
---
 fs/btrfs/ctree.c | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

Comments

Qu Wenruo Sept. 7, 2023, 11:59 p.m. UTC | #1 
On 2023/9/8 07:09, David Sterba wrote:
> There are two helpers to increase used bytes of root items that add or
> subtract one node size, we don't need to pass the argument for that.
> Rename the function so it matches the root item member that gets
> changed.
>
> Signed-off-by: David Sterba <dsterba@suse.com>

Reviewed-by: Qu Wenruo <wqu@suse.com>

Thanks,
Qu
> ---
>   fs/btrfs/ctree.c | 23 +++++++++++------------
>   1 file changed, 11 insertions(+), 12 deletions(-)
>
> diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
> index 792f9e3afad8..6d18f6d5a8b3 100644
> --- a/fs/btrfs/ctree.c
> +++ b/fs/btrfs/ctree.c
> @@ -947,19 +947,19 @@ int btrfs_bin_search(struct extent_buffer *eb, int first_slot,
>   	return 1;
>   }
>
> -static void root_add_used(struct btrfs_root *root, u32 size)
> +static void root_add_used_bytes(struct btrfs_root *root)
>   {
>   	spin_lock(&root->accounting_lock);
>   	btrfs_set_root_used(&root->root_item,
> -			    btrfs_root_used(&root->root_item) + size);
> +		btrfs_root_used(&root->root_item) + root->fs_info->nodesize);
>   	spin_unlock(&root->accounting_lock);
>   }
>
> -static void root_sub_used(struct btrfs_root *root, u32 size)
> +static void root_sub_used_bytes(struct btrfs_root *root)
>   {
>   	spin_lock(&root->accounting_lock);
>   	btrfs_set_root_used(&root->root_item,
> -			    btrfs_root_used(&root->root_item) - size);
> +		btrfs_root_used(&root->root_item) - root->fs_info->nodesize);
>   	spin_unlock(&root->accounting_lock);
>   }
>
> @@ -1075,7 +1075,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
>   		/* once for the path */
>   		free_extent_buffer(mid);
>
> -		root_sub_used(root, mid->len);
> +		root_sub_used_bytes(root);
>   		btrfs_free_tree_block(trans, btrfs_root_id(root), mid, 0, 1);
>   		/* once for the root ptr */
>   		free_extent_buffer_stale(mid);
> @@ -1145,7 +1145,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
>   				right = NULL;
>   				goto out;
>   			}
> -			root_sub_used(root, right->len);
> +			root_sub_used_bytes(root);
>   			btrfs_free_tree_block(trans, btrfs_root_id(root), right,
>   					      0, 1);
>   			free_extent_buffer_stale(right);
> @@ -1203,7 +1203,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
>   			mid = NULL;
>   			goto out;
>   		}
> -		root_sub_used(root, mid->len);
> +		root_sub_used_bytes(root);
>   		btrfs_free_tree_block(trans, btrfs_root_id(root), mid, 0, 1);
>   		free_extent_buffer_stale(mid);
>   		mid = NULL;
> @@ -2937,7 +2937,6 @@ static noinline int insert_new_root(struct btrfs_trans_handle *trans,
>   			   struct btrfs_root *root,
>   			   struct btrfs_path *path, int level)
>   {
> -	struct btrfs_fs_info *fs_info = root->fs_info;
>   	u64 lower_gen;
>   	struct extent_buffer *lower;
>   	struct extent_buffer *c;
> @@ -2960,7 +2959,7 @@ static noinline int insert_new_root(struct btrfs_trans_handle *trans,
>   	if (IS_ERR(c))
>   		return PTR_ERR(c);
>
> -	root_add_used(root, fs_info->nodesize);
> +	root_add_used_bytes(root);
>
>   	btrfs_set_header_nritems(c, 1);
>   	btrfs_set_node_key(c, &lower_key, 0);
> @@ -3104,7 +3103,7 @@ static noinline int split_node(struct btrfs_trans_handle *trans,
>   	if (IS_ERR(split))
>   		return PTR_ERR(split);
>
> -	root_add_used(root, fs_info->nodesize);
> +	root_add_used_bytes(root);
>   	ASSERT(btrfs_header_level(c) == level);
>
>   	ret = btrfs_tree_mod_log_eb_copy(split, c, 0, mid, c_nritems - mid);
> @@ -3857,7 +3856,7 @@ static noinline int split_leaf(struct btrfs_trans_handle *trans,
>   	if (IS_ERR(right))
>   		return PTR_ERR(right);
>
> -	root_add_used(root, fs_info->nodesize);
> +	root_add_used_bytes(root);
>
>   	if (split == 0) {
>   		if (mid <= slot) {
> @@ -4530,7 +4529,7 @@ static noinline int btrfs_del_leaf(struct btrfs_trans_handle *trans,
>   	 */
>   	btrfs_unlock_up_safe(path, 0);
>
> -	root_sub_used(root, leaf->len);
> +	root_sub_used_bytes(root);
>
>   	atomic_inc(&leaf->refs);
>   	btrfs_free_tree_block(trans, btrfs_root_id(root), leaf, 0, 1);
diff mbox series

Patch

diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index 792f9e3afad8..6d18f6d5a8b3 100644
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -947,19 +947,19 @@  int btrfs_bin_search(struct extent_buffer *eb, int first_slot,
 	return 1;
 }
 
-static void root_add_used(struct btrfs_root *root, u32 size)
+static void root_add_used_bytes(struct btrfs_root *root)
 {
 	spin_lock(&root->accounting_lock);
 	btrfs_set_root_used(&root->root_item,
-			    btrfs_root_used(&root->root_item) + size);
+		btrfs_root_used(&root->root_item) + root->fs_info->nodesize);
 	spin_unlock(&root->accounting_lock);
 }
 
-static void root_sub_used(struct btrfs_root *root, u32 size)
+static void root_sub_used_bytes(struct btrfs_root *root)
 {
 	spin_lock(&root->accounting_lock);
 	btrfs_set_root_used(&root->root_item,
-			    btrfs_root_used(&root->root_item) - size);
+		btrfs_root_used(&root->root_item) - root->fs_info->nodesize);
 	spin_unlock(&root->accounting_lock);
 }
 
@@ -1075,7 +1075,7 @@  static noinline int balance_level(struct btrfs_trans_handle *trans,
 		/* once for the path */
 		free_extent_buffer(mid);
 
-		root_sub_used(root, mid->len);
+		root_sub_used_bytes(root);
 		btrfs_free_tree_block(trans, btrfs_root_id(root), mid, 0, 1);
 		/* once for the root ptr */
 		free_extent_buffer_stale(mid);
@@ -1145,7 +1145,7 @@  static noinline int balance_level(struct btrfs_trans_handle *trans,
 				right = NULL;
 				goto out;
 			}
-			root_sub_used(root, right->len);
+			root_sub_used_bytes(root);
 			btrfs_free_tree_block(trans, btrfs_root_id(root), right,
 					      0, 1);
 			free_extent_buffer_stale(right);
@@ -1203,7 +1203,7 @@  static noinline int balance_level(struct btrfs_trans_handle *trans,
 			mid = NULL;
 			goto out;
 		}
-		root_sub_used(root, mid->len);
+		root_sub_used_bytes(root);
 		btrfs_free_tree_block(trans, btrfs_root_id(root), mid, 0, 1);
 		free_extent_buffer_stale(mid);
 		mid = NULL;
@@ -2937,7 +2937,6 @@  static noinline int insert_new_root(struct btrfs_trans_handle *trans,
 			   struct btrfs_root *root,
 			   struct btrfs_path *path, int level)
 {
-	struct btrfs_fs_info *fs_info = root->fs_info;
 	u64 lower_gen;
 	struct extent_buffer *lower;
 	struct extent_buffer *c;
@@ -2960,7 +2959,7 @@  static noinline int insert_new_root(struct btrfs_trans_handle *trans,
 	if (IS_ERR(c))
 		return PTR_ERR(c);
 
-	root_add_used(root, fs_info->nodesize);
+	root_add_used_bytes(root);
 
 	btrfs_set_header_nritems(c, 1);
 	btrfs_set_node_key(c, &lower_key, 0);
@@ -3104,7 +3103,7 @@  static noinline int split_node(struct btrfs_trans_handle *trans,
 	if (IS_ERR(split))
 		return PTR_ERR(split);
 
-	root_add_used(root, fs_info->nodesize);
+	root_add_used_bytes(root);
 	ASSERT(btrfs_header_level(c) == level);
 
 	ret = btrfs_tree_mod_log_eb_copy(split, c, 0, mid, c_nritems - mid);
@@ -3857,7 +3856,7 @@  static noinline int split_leaf(struct btrfs_trans_handle *trans,
 	if (IS_ERR(right))
 		return PTR_ERR(right);
 
-	root_add_used(root, fs_info->nodesize);
+	root_add_used_bytes(root);
 
 	if (split == 0) {
 		if (mid <= slot) {
@@ -4530,7 +4529,7 @@  static noinline int btrfs_del_leaf(struct btrfs_trans_handle *trans,
 	 */
 	btrfs_unlock_up_safe(path, 0);
 
-	root_sub_used(root, leaf->len);
+	root_sub_used_bytes(root);
 
 	atomic_inc(&leaf->refs);
 	btrfs_free_tree_block(trans, btrfs_root_id(root), leaf, 0, 1);