summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2016-03-07 17:29:34 -0900
committerKent Overstreet <kent.overstreet@gmail.com>2016-07-25 22:30:54 -0800
commitce0c17251193bddb4c8b15de26a560095384e6e1 (patch)
tree5978d21314ebb3d6ed9aee4c5e4a46a436c3c00d
parent3741b3b4b379b22846f62a47a966ec529f0a550b (diff)
downloadlinux-bcache-pagecache_iter-4.6.tar.zst
radix-tree: kill radix_tree_gang_lookup_slot()pagecache_iter-4.6
-rw-r--r--include/linux/radix-tree.h4
-rw-r--r--lib/radix-tree.c42
2 files changed, 0 insertions, 46 deletions
diff --git a/include/linux/radix-tree.h b/include/linux/radix-tree.h
index b7539c94bcdf..2f0ef1e71466 100644
--- a/include/linux/radix-tree.h
+++ b/include/linux/radix-tree.h
@@ -159,7 +159,6 @@ do { \
* radix_tree_lookup_slot
* radix_tree_tag_get
* radix_tree_gang_lookup
- * radix_tree_gang_lookup_slot
* radix_tree_gang_lookup_tag
* radix_tree_gang_lookup_tag_slot
* radix_tree_tagged
@@ -291,9 +290,6 @@ 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_slot(struct radix_tree_root *root,
- void ***results, unsigned long *indices,
- unsigned long first_index, unsigned int max_items);
int radix_tree_preload(gfp_t gfp_mask);
int radix_tree_maybe_preload(gfp_t gfp_mask);
void radix_tree_init(void);
diff --git a/lib/radix-tree.c b/lib/radix-tree.c
index 1624c4117961..3192230de6d9 100644
--- a/lib/radix-tree.c
+++ b/lib/radix-tree.c
@@ -1127,48 +1127,6 @@ radix_tree_gang_lookup(struct radix_tree_root *root, void **results,
EXPORT_SYMBOL(radix_tree_gang_lookup);
/**
- * radix_tree_gang_lookup_slot - perform multiple slot lookup on radix tree
- * @root: radix tree root
- * @results: where the results of the lookup are placed
- * @indices: where their indices should be placed (but usually NULL)
- * @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
- * their slots at *@results and returns the number of items which were
- * placed at *@results.
- *
- * The implementation is naive.
- *
- * Like radix_tree_gang_lookup as far as RCU and locking goes. Slots must
- * be dereferenced with radix_tree_deref_slot, and if using only RCU
- * protection, radix_tree_deref_slot may fail requiring a retry.
- */
-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)
-{
- 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] = slot;
- if (indices)
- indices[ret] = iter.index;
- if (++ret == max_items)
- break;
- }
-
- return ret;
-}
-EXPORT_SYMBOL(radix_tree_gang_lookup_slot);
-
-/**
* radix_tree_gang_lookup_tag - perform multiple lookup on a radix tree
* based on a tag
* @root: radix tree root