btrfs-progs: Remove the duplicated @level parameter for btrfs_bin_search()
PATCH 1/1 btrfs-progs: Remove the duplicated @level parameter for btrfs_bin_search()
We can easily get the level from @eb parameter, thus the level is not needed.
This is inspired by the work of Marek in U-boot.
Cc Marek Behun <[email protected]>
Signed-off-by Qu Wenruo <[email protected]>
--- check/main.c | 2 +- ctree.c | 6 +++--- ctree.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
check/main.c +1 -1
@@ -6478,7 +6478,7 @@ static int run_next_block(struct btrfs_root *root,* technically unreferenced and don't need to be worried about. */ if (ri !=NULL && ri->drop_level && level > ri->drop_level) { - ret =btrfs_bin_search (buf, &ri->drop_key, level, &i); + ret =btrfs_bin_search (buf, &ri->drop_key, &i);if (ret && i >0 ) i--; }
ctree.c +3 -3
@@ -666,9 +666,9 @@ static int generic_bin_search(struct extent_buffer *eb, unsigned long p,* leaves vs nodes */ int btrfs_bin_search (struct extent_buffer *eb,const struct btrfs_key *key, -int level,int *slot) +int *slot) { -if (level ==0 ) +if (btrfs_header_level (eb) ==0 ) return generic_bin_search(eb, offsetof(struct btrfs_leaf, items), sizeof(struct btrfs_item),
@@ -1199,7 +1199,7 @@ again: ret =check_block (fs_info, p, level);if (ret)return -1 ; - ret =btrfs_bin_search (b, key, level, &slot); + ret =btrfs_bin_search (b, key, &slot);if (level !=0 ) {if (ret && slot >0 ) slot -=1 ;
ctree.h +1 -1
@@ -1756,7 +1756,7 @@ int btrfs_search_slot_for_read(struct btrfs_root *root, struct btrfs_path *p, int find_higher, int return_any);int btrfs_bin_search (struct extent_buffer *eb,const struct btrfs_key *key, -int level,int *slot); +int *slot);int btrfs_find_item (struct btrfs_root *fs_root,struct btrfs_path *found_path,u64 iobjectid,u64 ioff,u8 key_type,struct btrfs_key *found_key);
Signature · 1 line
2.26.0
Looks good,
Reviewed-by Johannes Thumshirn <[email protected]>
Quoted 7 lines · Qu Wenruo
We can easily get the level from @eb parameter, thus the level is not needed.
This is inspired by the work of Marek in U-boot.
Cc Marek Behun <[email protected]>Signed-off-by Qu Wenruo <[email protected]>
Added to devel, thanks.