btrfs: ctree: Remove max argument from generic_bin_search
PATCH 1/1 btrfs: ctree: Remove max argument from generic_bin_search
Both callers use btrfs_header_nritems to feed the max argument. Remove the argument and let generic_bin_search call it itself.
Signed-off-by Marcos Paulo de Souza <[email protected]>
--- fs/btrfs/ctree.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)
fs/btrfs/ctree.c +8 -10
@@ -726,22 +726,22 @@ int btrfs_realloc_node(struct btrfs_trans_handle *trans,/* * search for key in the extent_buffer. The items start at offset p, -* and they are item_size apart. There are 'max' items in p. +* and they are item_size apart. * * the slot in the array is returned via slot, and it points to * the place where you would insert key if it is not found in * the array. * -* slot may point to max if the key is bigger than all of the keys +* slot may point to total number of items if the key is bigger than +* all of the keys */ static noinline int generic_bin_search(struct extent_buffer *eb,unsigned long p,int item_size, -const struct btrfs_key *key, -int max,int *slot) +const struct btrfs_key *key,int *slot) { -int low =0 ; -int high = max;int ret; +int low =0 ; +int high =btrfs_header_nritems (eb);const int key_size =sizeof (struct btrfs_disk_key );if (low > high) {
@@ -800,14 +800,12 @@ int btrfs_bin_search(struct extent_buffer *eb, const struct btrfs_key *key,return generic_bin_search (eb, offsetof(struct btrfs_leaf , items),sizeof (struct btrfs_item ), - key,btrfs_header_nritems (eb), - slot); + key, slot); else return generic_bin_search(eb,offsetof (struct btrfs_node ,ptrs ), sizeof(struct btrfs_key_ptr), -key ,btrfs_header_nritems (eb ), -slot ); +key ,slot ); }static void root_add_used (struct btrfs_root *root,u32 size)
Signature · 1 line
2.26.2
Quoted 4 lines · Marcos Paulo de Souza
Both callers use
btrfs_header_nritemsto feed the max argument. Remove the argument and letgeneric_bin_searchcall it itself.Signed-off-by Marcos Paulo de Souza <[email protected]>
Reviewed-by Nikolay Borisov <[email protected]>
Quoted 4 lines · Marcos Paulo de Souza
Both callers use
btrfs_header_nritemsto feed the max argument. Remove the argument and letgeneric_bin_searchcall it itself.Signed-off-by Marcos Paulo de Souza <[email protected]>
Added to misc-next, thanks.