radix-tree: rename indirect_to_ptr() to entry_to_node()
Mirrors the earlier commit introducing node_to_entry(). Also change the type returned to be a struct radix_tree_node pointer. That lets us simplify a couple of places in the radix tree shrink & extend paths where we could convert an entry into a pointer, modify the node, then convert the pointer back into an entry. Signed-off-by: Matthew Wilcox <willy@linux.intel.com> Cc: Konstantin Khlebnikov <koct9i@gmail.com> Cc: Kirill Shutemov <kirill.shutemov@linux.intel.com> Cc: Jan Kara <jack@suse.com> Cc: Neil Brown <neilb@suse.de> Cc: Ross Zwisler <ross.zwisler@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:

committed by
Linus Torvalds

parent
a4db4dcea1
commit
4dd6c0987c
@@ -149,7 +149,7 @@ static int verify_node(struct radix_tree_node *slot, unsigned int tag,
|
||||
int i;
|
||||
int j;
|
||||
|
||||
slot = indirect_to_ptr(slot);
|
||||
slot = entry_to_node(slot);
|
||||
|
||||
/* Verify consistency at this level */
|
||||
for (i = 0; i < RADIX_TREE_TAG_LONGS; i++) {
|
||||
@@ -227,7 +227,7 @@ void tree_verify_min_height(struct radix_tree_root *root, int maxindex)
|
||||
return;
|
||||
}
|
||||
|
||||
node = indirect_to_ptr(node);
|
||||
node = entry_to_node(node);
|
||||
assert(maxindex <= node_maxindex(node));
|
||||
|
||||
shift = node->shift;
|
||||
|
@@ -39,7 +39,6 @@ void verify_tag_consistency(struct radix_tree_root *root, unsigned int tag);
|
||||
extern int nr_allocated;
|
||||
|
||||
/* Normally private parts of lib/radix-tree.c */
|
||||
void *indirect_to_ptr(void *ptr);
|
||||
void radix_tree_dump(struct radix_tree_root *root);
|
||||
int root_tag_get(struct radix_tree_root *root, unsigned int tag);
|
||||
unsigned long node_maxindex(struct radix_tree_node *);
|
||||
|
Reference in New Issue
Block a user