summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Wilcox <mawilcox@microsoft.com>2017-11-28 18:01:24 +0300
committerMatthew Wilcox <mawilcox@microsoft.com>2018-02-07 00:40:32 +0300
commit322d884ba731e05ca79ae58e9dee1ef7dc4de504 (patch)
tree23646b0840d74b695f8e0b44f176283830c2cf8f
parent234a4624efe5629a777b4c00dbdf41dd8b7332db (diff)
downloadlinux-322d884ba731e05ca79ae58e9dee1ef7dc4de504.tar.xz
idr: Delete idr_find_ext function
Simply changing idr_remove's 'id' argument to 'unsigned long' works for all callers. Signed-off-by: Matthew Wilcox <mawilcox@microsoft.com>
-rw-r--r--include/linux/idr.h7
-rw-r--r--net/sched/act_api.c2
-rw-r--r--net/sched/cls_api.c2
-rw-r--r--net/sched/cls_flower.c2
4 files changed, 4 insertions, 9 deletions
diff --git a/include/linux/idr.h b/include/linux/idr.h
index f1299c4dc45f..7867d6117535 100644
--- a/include/linux/idr.h
+++ b/include/linux/idr.h
@@ -179,16 +179,11 @@ static inline void idr_preload_end(void)
* This function can be called under rcu_read_lock(), given that the leaf
* pointers lifetimes are correctly managed.
*/
-static inline void *idr_find_ext(const struct idr *idr, unsigned long id)
+static inline void *idr_find(const struct idr *idr, unsigned long id)
{
return radix_tree_lookup(&idr->idr_rt, id);
}
-static inline void *idr_find(const struct idr *idr, int id)
-{
- return idr_find_ext(idr, id);
-}
-
/**
* idr_for_each_entry - iterate over an idr's elements of a given type
* @idr: idr handle
diff --git a/net/sched/act_api.c b/net/sched/act_api.c
index 1572466be031..89e9189ab35c 100644
--- a/net/sched/act_api.c
+++ b/net/sched/act_api.c
@@ -222,7 +222,7 @@ static struct tc_action *tcf_idr_lookup(u32 index, struct tcf_idrinfo *idrinfo)
struct tc_action *p = NULL;
spin_lock_bh(&idrinfo->lock);
- p = idr_find_ext(&idrinfo->action_idr, index);
+ p = idr_find(&idrinfo->action_idr, index);
spin_unlock_bh(&idrinfo->lock);
return p;
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index 6d0e9bc4c782..802ac9d1eaab 100644
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -434,7 +434,7 @@ static struct tcf_block *tcf_block_lookup(struct net *net, u32 block_index)
{
struct tcf_net *tn = net_generic(net, tcf_net_id);
- return idr_find_ext(&tn->idr, block_index);
+ return idr_find(&tn->idr, block_index);
}
static struct tcf_chain *tcf_block_chain_zero(struct tcf_block *block)
diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c
index 0d1b0c11de34..2162e1c1f382 100644
--- a/net/sched/cls_flower.c
+++ b/net/sched/cls_flower.c
@@ -334,7 +334,7 @@ static void *fl_get(struct tcf_proto *tp, u32 handle)
{
struct cls_fl_head *head = rtnl_dereference(tp->root);
- return idr_find_ext(&head->handle_idr, handle);
+ return idr_find(&head->handle_idr, handle);
}
static const struct nla_policy fl_policy[TCA_FLOWER_MAX + 1] = {