lib/btree: simplify btree_{lookup|update}
PATCH 1/1 lib/btree: simplify btree_{lookup|update}
btree_{lookup|update} both need to look up node by key, using the common parts(add function btree_lookup_node) to simplify code.
Signed-off-by wuchi <[email protected]>
--- lib/btree.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-)
lib/btree.c +13 -17
@@ -238,7 +238,7 @@ static int keyzero(struct btree_geo *geo, unsigned long *key)return 1 ; } -void *btree_lookup (struct btree_head *head,struct btree_geo *geo, +static void *btree_lookup_node (struct btree_head *head,struct btree_geo *geo,unsigned long *key) {int i, height = head->height;
@@ -257,7 +257,16 @@ void *btree_lookup(struct btree_head *head, struct btree_geo *geo,if (!node)return NULL ; } +return node; +} +void *btree_lookup (struct btree_head *head,struct btree_geo *geo, +unsigned long *key) +{ +int i; +unsigned long *node; + + node =btree_lookup_node (head, geo, key);if (!node)return NULL ;
@@ -271,23 +280,10 @@ EXPORT_SYMBOL_GPL(btree_lookup);int btree_update (struct btree_head *head,struct btree_geo *geo,unsigned long *key,void *val) { -int i, height = head->height; -unsigned long *node = head->node; - -if (height ==0 ) -return -ENOENT ; - -for ( ; height >1 ; height--) { -for (i =0 ; i < geo->no_pairs; i++) -if (keycmp (geo, node, i, key) <=0 ) -break ; -if (i == geo->no_pairs) -return -ENOENT ; - node =bval (geo, node, i); -if (!node) -return -ENOENT ; - } +int i; +unsigned long *node; + node =btree_lookup_node (head, geo, key);if (!node)return -ENOENT ;
Signature · 1 line
2.20.1