Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb969909 authored by Ross Zwisler's avatar Ross Zwisler Committed by Linus Torvalds
Browse files

radix-tree: rewrite radix_tree_tag_set 



Use the new multi-order support functions to rewrite
radix_tree_tag_set()

Signed-off-by: default avatarRoss Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: default avatarMatthew 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>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 643b57d0

lib/radix-tree.c

+17 −20
Original line number Diff line number Diff line
@@ -722,35 +722,32 @@ EXPORT_SYMBOL(radix_tree_lookup); 
void *radix_tree_tag_set(struct radix_tree_root *root,

			unsigned long index, unsigned int tag)

{

	unsigned int height, shift;

	struct radix_tree_node *slot;



	height = root->height;

	BUG_ON(index > radix_tree_maxindex(height));

	struct radix_tree_node *node, *parent;

	unsigned long maxindex;

	unsigned int shift;



	slot = indirect_to_ptr(root->rnode);

	shift = (height - 1) * RADIX_TREE_MAP_SHIFT;

	shift = radix_tree_load_root(root, &node, &maxindex);

	BUG_ON(index > maxindex);



	while (height > 0) {

		int offset;

	while (radix_tree_is_indirect_ptr(node)) {

		unsigned offset;



		offset = (index >> shift) & RADIX_TREE_MAP_MASK;

		if (!tag_get(slot, tag, offset))

			tag_set(slot, tag, offset);

		slot = slot->slots[offset];

		BUG_ON(slot == NULL);

		if (!radix_tree_is_indirect_ptr(slot))

			break;

		slot = indirect_to_ptr(slot);

		shift -= RADIX_TREE_MAP_SHIFT;

		height--;

		offset = (index >> shift) & RADIX_TREE_MAP_MASK;



		parent = indirect_to_ptr(node);

		offset = radix_tree_descend(parent, &node, offset);

		BUG_ON(!node);



		if (!tag_get(parent, tag, offset))

			tag_set(parent, tag, offset);

	}



	/* set the root's tag bit */

	if (slot && !root_tag_get(root, tag))

	if (!root_tag_get(root, tag))

		root_tag_set(root, tag);



	return slot;

	return node;

}

EXPORT_SYMBOL(radix_tree_tag_set);