lib-btree-simplify-btree_lookupupdate.patch removed from -mm tree
The quilt patch titled
Subject: lib/btree: simplify btree_{lookup|update}has been removed from the -mm tree. Its filename was
lib-btree-simplify-btree_lookupupdate.patch
This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: wuchi <[email protected]>
Subject: lib/btree: simplify btree_{lookup|update}
Date: Tue, 7 Jun 2022 21:35:56 +0800
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]>
Cc Peter Zijlstra (Intel) <[email protected]>
Cc Arnaldo Carvalho de Melo <[email protected]>
Cc Jiri Olsa <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
lib/btree.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-)
lib/btree.c renamed from lib/btree.c~lib-btree-simplify-btree_lookupupdate +13 -17
@@ -238,7 +238,7 @@ static int keyzero(struct btree_geo *georeturn 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 *heif (!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 ;
_
Patches currently in -mm which might be from [email protected] are
lib-debugobjects-fix-stat-count-and-optimize-debug_objects_mem_init.patch