Commit c0af32fd authored by wuchi's avatar wuchi Committed by Andrew Morton
Browse files

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.

Link: https://lkml.kernel.org/r/20220607133556.34732-1-wuchi.zero@gmail.com


Signed-off-by: default avatarwuchi <wuchi.zero@gmail.com>
Cc: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 9776e386

lib/btree.c

+13 −17
Original line number Diff line number Diff line
@@ -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;