diff mbox series

[2/8] btrfs-progs: Remove root argument from btrfs_fixup_low_keys

Message ID 20210913131729.37897-3-nborisov@suse.com (mailing list archive)
State New, archived
Headers show
Series Implement progs support for removing received uuid on RW vols | expand

Commit Message

Nikolay Borisov Sept. 13, 2021, 1:17 p.m. UTC 
It's not used, so just remove it.

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
---
 check/main.c          |  5 ++---
 kernel-shared/ctree.c | 24 +++++++++++-------------
 kernel-shared/ctree.h |  4 ++--
 3 files changed, 15 insertions(+), 18 deletions(-)

Comments

Qu Wenruo Sept. 14, 2021, 1:01 a.m. UTC | #1 
On 2021/9/13 下午9:17, Nikolay Borisov wrote:
> It's not used, so just remove it.
>
> Signed-off-by: Nikolay Borisov <nborisov@suse.com>

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

Just one unrelated topic inlined below.

> ---
>   check/main.c          |  5 ++---
>   kernel-shared/ctree.c | 24 +++++++++++-------------
>   kernel-shared/ctree.h |  4 ++--
>   3 files changed, 15 insertions(+), 18 deletions(-)
>
> diff --git a/check/main.c b/check/main.c
> index a88518159830..6369bdd90656 100644
> --- a/check/main.c
> +++ b/check/main.c
> @@ -4197,8 +4197,7 @@ static int swap_values(struct btrfs_root *root, struct btrfs_path *path,
>   			struct btrfs_disk_key key;
>
>   			btrfs_node_key(buf, &key, 0);
> -			btrfs_fixup_low_keys(root, path, &key,
> -					     btrfs_header_level(buf) + 1);
> +			btrfs_fixup_low_keys(path, &key, btrfs_header_level(buf) + 1);
>   		}
>   	} else {
>   		struct btrfs_item *item1, *item2;
> @@ -4302,7 +4301,7 @@ static int delete_bogus_item(struct btrfs_root *root,
>   		struct btrfs_disk_key disk_key;
>
>   		btrfs_item_key(buf, &disk_key, 0);
> -		btrfs_fixup_low_keys(root, path, &disk_key, 1);
> +		btrfs_fixup_low_keys(path, &disk_key, 1);
>   	}
>   	btrfs_mark_buffer_dirty(buf);
>   	return 0;
> diff --git a/kernel-shared/ctree.c b/kernel-shared/ctree.c
> index 518718de04dd..02eb975338e5 100644
> --- a/kernel-shared/ctree.c
> +++ b/kernel-shared/ctree.c
> @@ -1437,8 +1437,8 @@ int btrfs_search_slot_for_read(struct btrfs_root *root,
>    * fixing up pointers when a given leaf/node is not in slot 0 of the
>    * higher levels
>    */
> -void btrfs_fixup_low_keys(struct btrfs_root *root, struct btrfs_path *path,
> -			  struct btrfs_disk_key *key, int level)

Isn't it recommended to use btrfs_key instead of btrfs_disk_key nowadays?

Maybe a good time to cleanup unnecessary btrfs_disk_key usage?

Thanks,
Qu

> +void btrfs_fixup_low_keys( struct btrfs_path *path, struct btrfs_disk_key *key,
> +		int level)
>   {
>   	int i;
>   	struct extent_buffer *t;
> @@ -1485,7 +1485,7 @@ int btrfs_set_item_key_safe(struct btrfs_root *root, struct btrfs_path *path,
>   	btrfs_set_item_key(eb, &disk_key, slot);
>   	btrfs_mark_buffer_dirty(eb);
>   	if (slot == 0)
> -		btrfs_fixup_low_keys(root, path, &disk_key, 1);
> +		btrfs_fixup_low_keys(path, &disk_key, 1);
>   	return 0;
>   }
>
> @@ -1508,7 +1508,7 @@ void btrfs_set_item_key_unsafe(struct btrfs_root *root,
>   	btrfs_set_item_key(eb, &disk_key, slot);
>   	btrfs_mark_buffer_dirty(eb);
>   	if (slot == 0)
> -		btrfs_fixup_low_keys(root, path, &disk_key, 1);
> +		btrfs_fixup_low_keys(path, &disk_key, 1);
>   }
>
>   /*
> @@ -2184,7 +2184,7 @@ static int push_leaf_left(struct btrfs_trans_handle *trans, struct btrfs_root
>   		btrfs_mark_buffer_dirty(right);
>
>   	btrfs_item_key(right, &disk_key, 0);
> -	btrfs_fixup_low_keys(root, path, &disk_key, 1);
> +	btrfs_fixup_low_keys(path, &disk_key, 1);
>
>   	/* then fixup the leaf pointer in the path */
>   	if (path->slots[0] < push_items) {
> @@ -2415,10 +2415,8 @@ static noinline int split_leaf(struct btrfs_trans_handle *trans,
>   			free_extent_buffer(path->nodes[0]);
>   			path->nodes[0] = right;
>   			path->slots[0] = 0;
> -			if (path->slots[1] == 0) {
> -				btrfs_fixup_low_keys(root, path,
> -						     &disk_key, 1);
> -			}
> +			if (path->slots[1] == 0)
> +				btrfs_fixup_low_keys(path, &disk_key, 1);
>   		}
>   		btrfs_mark_buffer_dirty(right);
>   		return ret;
> @@ -2632,7 +2630,7 @@ int btrfs_truncate_item(struct btrfs_root *root, struct btrfs_path *path,
>   		btrfs_set_disk_key_offset(&disk_key, offset + size_diff);
>   		btrfs_set_item_key(leaf, &disk_key, slot);
>   		if (slot == 0)
> -			btrfs_fixup_low_keys(root, path, &disk_key, 1);
> +			btrfs_fixup_low_keys(path, &disk_key, 1);
>   	}
>
>   	item = btrfs_item_nr(slot);
> @@ -2809,7 +2807,7 @@ int btrfs_insert_empty_items(struct btrfs_trans_handle *trans,
>   	ret = 0;
>   	if (slot == 0) {
>   		btrfs_cpu_key_to_disk(&disk_key, cpu_key);
> -		btrfs_fixup_low_keys(root, path, &disk_key, 1);
> +		btrfs_fixup_low_keys(path, &disk_key, 1);
>   	}
>
>   	if (btrfs_leaf_free_space(leaf) < 0) {
> @@ -2882,7 +2880,7 @@ int btrfs_del_ptr(struct btrfs_root *root, struct btrfs_path *path,
>   		struct btrfs_disk_key disk_key;
>
>   		btrfs_node_key(parent, &disk_key, 0);
> -		btrfs_fixup_low_keys(root, path, &disk_key, level + 1);
> +		btrfs_fixup_low_keys(path, &disk_key, level + 1);
>   	}
>   	btrfs_mark_buffer_dirty(parent);
>   	return ret;
> @@ -2982,7 +2980,7 @@ int btrfs_del_items(struct btrfs_trans_handle *trans, struct btrfs_root *root,
>   			struct btrfs_disk_key disk_key;
>
>   			btrfs_item_key(leaf, &disk_key, 0);
> -			btrfs_fixup_low_keys(root, path, &disk_key, 1);
> +			btrfs_fixup_low_keys(path, &disk_key, 1);
>   		}
>
>   		/* delete the leaf if it is mostly empty */
> diff --git a/kernel-shared/ctree.h b/kernel-shared/ctree.h
> index f53436a7f38b..a17bf50e29b4 100644
> --- a/kernel-shared/ctree.h
> +++ b/kernel-shared/ctree.h
> @@ -2747,8 +2747,8 @@ static inline int btrfs_next_item(struct btrfs_root *root,
>
>   int btrfs_prev_leaf(struct btrfs_root *root, struct btrfs_path *path);
>   int btrfs_leaf_free_space(struct extent_buffer *leaf);
> -void btrfs_fixup_low_keys(struct btrfs_root *root, struct btrfs_path *path,
> -			  struct btrfs_disk_key *key, int level);
> +void btrfs_fixup_low_keys(struct btrfs_path *path, struct btrfs_disk_key *key,
> +		int level);
>   int btrfs_set_item_key_safe(struct btrfs_root *root, struct btrfs_path *path,
>   			    struct btrfs_key *new_key);
>   void btrfs_set_item_key_unsafe(struct btrfs_root *root,
>
diff mbox series

Patch

diff --git a/check/main.c b/check/main.c
index a88518159830..6369bdd90656 100644
--- a/check/main.c
+++ b/check/main.c
@@ -4197,8 +4197,7 @@  static int swap_values(struct btrfs_root *root, struct btrfs_path *path,
 			struct btrfs_disk_key key;
 
 			btrfs_node_key(buf, &key, 0);
-			btrfs_fixup_low_keys(root, path, &key,
-					     btrfs_header_level(buf) + 1);
+			btrfs_fixup_low_keys(path, &key, btrfs_header_level(buf) + 1);
 		}
 	} else {
 		struct btrfs_item *item1, *item2;
@@ -4302,7 +4301,7 @@  static int delete_bogus_item(struct btrfs_root *root,
 		struct btrfs_disk_key disk_key;
 
 		btrfs_item_key(buf, &disk_key, 0);
-		btrfs_fixup_low_keys(root, path, &disk_key, 1);
+		btrfs_fixup_low_keys(path, &disk_key, 1);
 	}
 	btrfs_mark_buffer_dirty(buf);
 	return 0;
diff --git a/kernel-shared/ctree.c b/kernel-shared/ctree.c
index 518718de04dd..02eb975338e5 100644
--- a/kernel-shared/ctree.c
+++ b/kernel-shared/ctree.c
@@ -1437,8 +1437,8 @@  int btrfs_search_slot_for_read(struct btrfs_root *root,
  * fixing up pointers when a given leaf/node is not in slot 0 of the
  * higher levels
  */
-void btrfs_fixup_low_keys(struct btrfs_root *root, struct btrfs_path *path,
-			  struct btrfs_disk_key *key, int level)
+void btrfs_fixup_low_keys( struct btrfs_path *path, struct btrfs_disk_key *key,
+		int level)
 {
 	int i;
 	struct extent_buffer *t;
@@ -1485,7 +1485,7 @@  int btrfs_set_item_key_safe(struct btrfs_root *root, struct btrfs_path *path,
 	btrfs_set_item_key(eb, &disk_key, slot);
 	btrfs_mark_buffer_dirty(eb);
 	if (slot == 0)
-		btrfs_fixup_low_keys(root, path, &disk_key, 1);
+		btrfs_fixup_low_keys(path, &disk_key, 1);
 	return 0;
 }
 
@@ -1508,7 +1508,7 @@  void btrfs_set_item_key_unsafe(struct btrfs_root *root,
 	btrfs_set_item_key(eb, &disk_key, slot);
 	btrfs_mark_buffer_dirty(eb);
 	if (slot == 0)
-		btrfs_fixup_low_keys(root, path, &disk_key, 1);
+		btrfs_fixup_low_keys(path, &disk_key, 1);
 }
 
 /*
@@ -2184,7 +2184,7 @@  static int push_leaf_left(struct btrfs_trans_handle *trans, struct btrfs_root
 		btrfs_mark_buffer_dirty(right);
 
 	btrfs_item_key(right, &disk_key, 0);
-	btrfs_fixup_low_keys(root, path, &disk_key, 1);
+	btrfs_fixup_low_keys(path, &disk_key, 1);
 
 	/* then fixup the leaf pointer in the path */
 	if (path->slots[0] < push_items) {
@@ -2415,10 +2415,8 @@  static noinline int split_leaf(struct btrfs_trans_handle *trans,
 			free_extent_buffer(path->nodes[0]);
 			path->nodes[0] = right;
 			path->slots[0] = 0;
-			if (path->slots[1] == 0) {
-				btrfs_fixup_low_keys(root, path,
-						     &disk_key, 1);
-			}
+			if (path->slots[1] == 0)
+				btrfs_fixup_low_keys(path, &disk_key, 1);
 		}
 		btrfs_mark_buffer_dirty(right);
 		return ret;
@@ -2632,7 +2630,7 @@  int btrfs_truncate_item(struct btrfs_root *root, struct btrfs_path *path,
 		btrfs_set_disk_key_offset(&disk_key, offset + size_diff);
 		btrfs_set_item_key(leaf, &disk_key, slot);
 		if (slot == 0)
-			btrfs_fixup_low_keys(root, path, &disk_key, 1);
+			btrfs_fixup_low_keys(path, &disk_key, 1);
 	}
 
 	item = btrfs_item_nr(slot);
@@ -2809,7 +2807,7 @@  int btrfs_insert_empty_items(struct btrfs_trans_handle *trans,
 	ret = 0;
 	if (slot == 0) {
 		btrfs_cpu_key_to_disk(&disk_key, cpu_key);
-		btrfs_fixup_low_keys(root, path, &disk_key, 1);
+		btrfs_fixup_low_keys(path, &disk_key, 1);
 	}
 
 	if (btrfs_leaf_free_space(leaf) < 0) {
@@ -2882,7 +2880,7 @@  int btrfs_del_ptr(struct btrfs_root *root, struct btrfs_path *path,
 		struct btrfs_disk_key disk_key;
 
 		btrfs_node_key(parent, &disk_key, 0);
-		btrfs_fixup_low_keys(root, path, &disk_key, level + 1);
+		btrfs_fixup_low_keys(path, &disk_key, level + 1);
 	}
 	btrfs_mark_buffer_dirty(parent);
 	return ret;
@@ -2982,7 +2980,7 @@  int btrfs_del_items(struct btrfs_trans_handle *trans, struct btrfs_root *root,
 			struct btrfs_disk_key disk_key;
 
 			btrfs_item_key(leaf, &disk_key, 0);
-			btrfs_fixup_low_keys(root, path, &disk_key, 1);
+			btrfs_fixup_low_keys(path, &disk_key, 1);
 		}
 
 		/* delete the leaf if it is mostly empty */
diff --git a/kernel-shared/ctree.h b/kernel-shared/ctree.h
index f53436a7f38b..a17bf50e29b4 100644
--- a/kernel-shared/ctree.h
+++ b/kernel-shared/ctree.h
@@ -2747,8 +2747,8 @@  static inline int btrfs_next_item(struct btrfs_root *root,
 
 int btrfs_prev_leaf(struct btrfs_root *root, struct btrfs_path *path);
 int btrfs_leaf_free_space(struct extent_buffer *leaf);
-void btrfs_fixup_low_keys(struct btrfs_root *root, struct btrfs_path *path,
-			  struct btrfs_disk_key *key, int level);
+void btrfs_fixup_low_keys(struct btrfs_path *path, struct btrfs_disk_key *key,
+		int level);
 int btrfs_set_item_key_safe(struct btrfs_root *root, struct btrfs_path *path,
 			    struct btrfs_key *new_key);
 void btrfs_set_item_key_unsafe(struct btrfs_root *root,