Messages in this thread Patch in this message | | | Date | Fri, 25 Nov 2005 23:12:15 +0800 | From | Wu Fengguang <> | Subject | [PATCH 05/19] radixtree: sync with mainline |
| |
The patch from Christoph Lameter:
[PATCH] radix-tree: Remove unnecessary indirections and clean up code
is only partially merged into -mm tree. This patch completes it.
Signed-off-by: Christoph Lameter <clameter@sgi.com> Signed-off-by: Wu Fengguang <wfg@mail.ustc.edu.cn> ---
lib/radix-tree.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-)
--- linux-2.6.14-mm1.orig/lib/radix-tree.c +++ linux-2.6.14-mm1/lib/radix-tree.c @@ -291,27 +291,25 @@ static inline void **__lookup_slot(struc unsigned long index) { unsigned int height, shift; - struct radix_tree_node **slot; + struct radix_tree_node *slot; height = root->height; if (index > radix_tree_maxindex(height)) return NULL; shift = (height-1) * RADIX_TREE_MAP_SHIFT; - slot = &root->rnode; + slot = root->rnode; while (height > 0) { - if (*slot == NULL) + if (slot == NULL) return NULL; - slot = (struct radix_tree_node **) - ((*slot)->slots + - ((index >> shift) & RADIX_TREE_MAP_MASK)); + slot = slot->slots[(index >> shift) & RADIX_TREE_MAP_MASK]; shift -= RADIX_TREE_MAP_SHIFT; height--; } - return (void **)slot; + return slot; } /** -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |