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-09-17 21:29:57 -0800
commita6d1b7c33e59f246281f8c77f7fe657525e512b0 (patch)
tree7d3f155745ccc78204a65c7bf041e9f4020d79c4
parent347ac669bb8b00defcf04fa3648f2668bdd3d835 (diff)
downloadlinux-bcache-pagecache_iter.tar.zst
radix-tree: kill radix_tree_gang_lookup_slot()pagecache_iter
-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 a83a42770f41..41e2bab16070 100644
--- a/include/linux/radix-tree.h
+++ b/include/linux/radix-tree.h
@@ -152,7 +152,6 @@ static inline bool radix_tree_empty(struct radix_tree_root *root)
* 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
@@ -286,9 +285,6 @@ struct radix_tree_node *radix_tree_replace_clear_tags(
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 8b7d8459bb9d..341f8217188c 100644
--- a/lib/radix-tree.c
+++ b/lib/radix-tree.c
@@ -1123,48 +1123,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