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

Commit fa0b80c1 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "radix-tree: add radix_tree_gang_lookup_index"

parents 07e83be9 b10632db

include/linux/radix-tree.h

+4 −0
Original line number Diff line number Diff line
@@ -274,6 +274,10 @@ void *radix_tree_delete(struct radix_tree_root *, unsigned long); 
unsigned int

radix_tree_gang_lookup(struct radix_tree_root *root, void **results,

			unsigned long first_index, unsigned int max_items);

unsigned int

radix_tree_gang_lookup_index(struct radix_tree_root *root, void **results,

			unsigned long *indices, unsigned long first_index,

			unsigned int max_items);

unsigned int radix_tree_gang_lookup_slot(struct radix_tree_root *root,

			void ***results, unsigned long *indices,

			unsigned long first_index, unsigned int max_items);

lib/radix-tree.c

+43 −0
Original line number Diff line number Diff line
@@ -1025,6 +1025,49 @@ radix_tree_gang_lookup(struct radix_tree_root *root, void **results, 
}

EXPORT_SYMBOL(radix_tree_gang_lookup);



/**

 *	radix_tree_gang_lookup_index - perform multiple lookup on a radix tree

 *	@root:		radix tree root

 *	@results:	where the results of the lookup are placed

 *	@indices:	where their indices should be placed

 *	@first_index:	start the lookup from this key

 *	@max_items:	place up to this many items at *results

 *

 *	Performs an index-ascending scan of the tree for present items.  Places

 *	them at *@results and returns the number of items which were placed at

 *	*@results. The indices are placed in @indices.

 *

 *	The implementation is naive.

 *

 *	Just one difference from radix_tree_gang_lookup, the indices are also

 *	collected along with the results of lookup.

 */

unsigned int

radix_tree_gang_lookup_index(struct radix_tree_root *root, void **results,

			unsigned long *indices, unsigned long first_index,

			unsigned int max_items)

{

	struct radix_tree_iter iter;

	void **slot;

	unsigned int ret = 0;



	if (unlikely(!max_items))

		return 0;



	radix_tree_for_each_slot(slot, root, &iter, first_index) {

		results[ret] = indirect_to_ptr(rcu_dereference_raw(*slot));

		if (!results[ret])

			continue;

		if (indices)

			indices[ret] = iter.index;

		if (++ret == max_items)

			break;

	}



	return ret;

}

EXPORT_SYMBOL(radix_tree_gang_lookup_index);



/**

 *	radix_tree_gang_lookup_slot - perform multiple slot lookup on radix tree

 *	@root:		radix tree root