idr: Delete idr_remove_ext function

Simply changing idr_remove's 'id' argument to 'unsigned long' suffices
for all callers.

Signed-off-by: Matthew Wilcox <mawilcox@microsoft.com>

diff --git a/include/linux/idr.h b/include/linux/idr.h
index fa14f834e4ede3a81e7e6182c889fec338b2495f..118987a17ada2974efbfea7ea96fe1271bc5cc5d 100644 (file)
--- a/include/linux/idr.h
+++ b/include/linux/idr.h
@@ -140,16 +140,11 @@ void *idr_replace(struct idr *, void *, int id);
 void *idr_replace_ext(struct idr *idr, void *ptr, unsigned long id);
 void idr_destroy(struct idr *);
 
-static inline void *idr_remove_ext(struct idr *idr, unsigned long id)
+static inline void *idr_remove(struct idr *idr, unsigned long id)
 {
        return radix_tree_delete_item(&idr->idr_rt, id, NULL);
 }
 
-static inline void *idr_remove(struct idr *idr, int id)
-{
-       return idr_remove_ext(idr, id);
-}
-
 static inline void idr_init(struct idr *idr)
 {
        INIT_RADIX_TREE(&idr->idr_rt, IDR_RT_MARKER);

diff --git a/net/sched/act_api.c b/net/sched/act_api.c
index 52622a3d25172e9a84a61421e19e36f2bf9708d5..be5b2b455371bda47367894ee51a1035ae171d42 100644 (file)
--- a/net/sched/act_api.c
+++ b/net/sched/act_api.c
@@ -78,7 +78,7 @@ static void free_tcf(struct tc_action *p)
 static void tcf_idr_remove(struct tcf_idrinfo *idrinfo, struct tc_action *p)
 {
        spin_lock_bh(&idrinfo->lock);
-       idr_remove_ext(&idrinfo->action_idr, p->tcfa_index);
+       idr_remove(&idrinfo->action_idr, p->tcfa_index);
        spin_unlock_bh(&idrinfo->lock);
        gen_kill_estimator(&p->tcfa_rate_est);
        free_tcf(p);

diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index bcb4ccb5f894b8e50e6c7373a091aacf5b66a107..6d0e9bc4c78280e099827d8994029508362f9606 100644 (file)
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -393,7 +393,7 @@ static void tcf_block_remove(struct tcf_block *block, struct net *net)
 {
        struct tcf_net *tn = net_generic(net, tcf_net_id);
 
-       idr_remove_ext(&tn->idr, block->index);
+       idr_remove(&tn->idr, block->index);
 }
 
 static struct tcf_block *tcf_block_create(struct net *net, struct Qdisc *q,

diff --git a/net/sched/cls_basic.c b/net/sched/cls_basic.c
index d333f5c5101d0d083588831f5c2f13f35299c05e..121dff0a176345007bddfc3a2d7d2fd77cd9c5a2 100644 (file)
--- a/net/sched/cls_basic.c
+++ b/net/sched/cls_basic.c
@@ -120,7 +120,7 @@ static void basic_destroy(struct tcf_proto *tp, struct netlink_ext_ack *extack)
        list_for_each_entry_safe(f, n, &head->flist, link) {
                list_del_rcu(&f->link);
                tcf_unbind_filter(tp, &f->res);
-               idr_remove_ext(&head->handle_idr, f->handle);
+               idr_remove(&head->handle_idr, f->handle);
                if (tcf_exts_get_net(&f->exts))
                        call_rcu(&f->rcu, basic_delete_filter);
                else
@@ -138,7 +138,7 @@ static int basic_delete(struct tcf_proto *tp, void *arg, bool *last,
 
        list_del_rcu(&f->link);
        tcf_unbind_filter(tp, &f->res);
-       idr_remove_ext(&head->handle_idr, f->handle);
+       idr_remove(&head->handle_idr, f->handle);
        tcf_exts_get_net(&f->exts);
        call_rcu(&f->rcu, basic_delete_filter);
        *last = list_empty(&head->flist);
@@ -228,7 +228,7 @@ static int basic_change(struct net *net, struct sk_buff *in_skb,
                              extack);
        if (err < 0) {
                if (!fold)
-                       idr_remove_ext(&head->handle_idr, fnew->handle);
+                       idr_remove(&head->handle_idr, fnew->handle);
                goto errout;
        }
 

diff --git a/net/sched/cls_bpf.c b/net/sched/cls_bpf.c
index 8e5326bc64402fcdfeef403dc16b85791ec689dd..e45137e3f56762eec7260963183c31f35f0637e4 100644 (file)
--- a/net/sched/cls_bpf.c
+++ b/net/sched/cls_bpf.c
@@ -295,7 +295,7 @@ static void __cls_bpf_delete(struct tcf_proto *tp, struct cls_bpf_prog *prog,
 {
        struct cls_bpf_head *head = rtnl_dereference(tp->root);
 
-       idr_remove_ext(&head->handle_idr, prog->handle);
+       idr_remove(&head->handle_idr, prog->handle);
        cls_bpf_stop_offload(tp, prog, extack);
        list_del_rcu(&prog->link);
        tcf_unbind_filter(tp, &prog->res);
@@ -542,7 +542,7 @@ errout_parms:
        cls_bpf_free_parms(prog);
 errout_idr:
        if (!oldprog)
-               idr_remove_ext(&head->handle_idr, prog->handle);
+               idr_remove(&head->handle_idr, prog->handle);
 errout:
        tcf_exts_destroy(&prog->exts);
        kfree(prog);

diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c
index dc9acaafc0a80943e0c7825123790aa3ce910cb0..e098e8ab76c9d7c754fee5aad059864da698b950 100644 (file)
--- a/net/sched/cls_flower.c
+++ b/net/sched/cls_flower.c
@@ -288,7 +288,7 @@ static void __fl_delete(struct tcf_proto *tp, struct cls_fl_filter *f,
 {
        struct cls_fl_head *head = rtnl_dereference(tp->root);
 
-       idr_remove_ext(&head->handle_idr, f->handle);
+       idr_remove(&head->handle_idr, f->handle);
        list_del_rcu(&f->list);
        if (!tc_skip_hw(f->flags))
                fl_hw_destroy_filter(tp, f, extack);
@@ -981,7 +981,7 @@ static int fl_change(struct net *net, struct sk_buff *in_skb,
 
 errout_idr:
        if (fnew->handle)
-               idr_remove_ext(&head->handle_idr, fnew->handle);
+               idr_remove(&head->handle_idr, fnew->handle);
 errout:
        tcf_exts_destroy(&fnew->exts);
        kfree(fnew);

diff --git a/net/sched/cls_u32.c b/net/sched/cls_u32.c
index e3c5e390ec23a459b3d971d00d18882d56e83c01..bd55ed783cb176b8709523bd4d26d5e88c25870b 100644 (file)
--- a/net/sched/cls_u32.c
+++ b/net/sched/cls_u32.c
@@ -596,7 +596,7 @@ static void u32_clear_hnode(struct tcf_proto *tp, struct tc_u_hnode *ht,
                                         rtnl_dereference(n->next));
                        tcf_unbind_filter(tp, &n->res);
                        u32_remove_hw_knode(tp, n, extack);
-                       idr_remove_ext(&ht->handle_idr, n->handle);
+                       idr_remove(&ht->handle_idr, n->handle);
                        if (tcf_exts_get_net(&n->exts))
                                call_rcu(&n->rcu, u32_delete_key_freepf_rcu);
                        else
@@ -623,7 +623,7 @@ static int u32_destroy_hnode(struct tcf_proto *tp, struct tc_u_hnode *ht,
                if (phn == ht) {
                        u32_clear_hw_hnode(tp, ht, extack);
                        idr_destroy(&ht->handle_idr);
-                       idr_remove_ext(&tp_c->handle_idr, ht->handle);
+                       idr_remove(&tp_c->handle_idr, ht->handle);
                        RCU_INIT_POINTER(*hn, ht->next);
                        kfree_rcu(ht, rcu);
                        return 0;
@@ -1026,7 +1026,7 @@ static int u32_change(struct net *net, struct sk_buff *in_skb,
 
                err = u32_replace_hw_hnode(tp, ht, flags, extack);
                if (err) {
-                       idr_remove_ext(&tp_c->handle_idr, handle);
+                       idr_remove(&tp_c->handle_idr, handle);
                        kfree(ht);
                        return err;
                }
@@ -1162,7 +1162,7 @@ errfree:
 #endif
        kfree(n);
 erridr:
-       idr_remove_ext(&ht->handle_idr, handle);
+       idr_remove(&ht->handle_idr, handle);
        return err;
 }