aboutsummaryrefslogtreecommitdiffstats
path: root/net/sched/cls_basic.c
diff options
context:
space:
mode:
authorMatthew Wilcox <mawilcox@microsoft.com>2017-11-28 09:48:43 -0500
committerMatthew Wilcox <mawilcox@microsoft.com>2018-02-06 16:40:31 -0500
commit9c160941403ba833c8e67981806ccae73ff7aca7 (patch)
tree0c84ab081d997296163970f22097a981c6a3ca37 /net/sched/cls_basic.c
parent6e6d301490936789ff57daaaaf63f44d928a4028 (diff)
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>
Diffstat (limited to 'net/sched/cls_basic.c')
-rw-r--r--net/sched/cls_basic.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/sched/cls_basic.c b/net/sched/cls_basic.c
index d333f5c5101d..121dff0a1763 100644
--- 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)
120 list_for_each_entry_safe(f, n, &head->flist, link) { 120 list_for_each_entry_safe(f, n, &head->flist, link) {
121 list_del_rcu(&f->link); 121 list_del_rcu(&f->link);
122 tcf_unbind_filter(tp, &f->res); 122 tcf_unbind_filter(tp, &f->res);
123 idr_remove_ext(&head->handle_idr, f->handle); 123 idr_remove(&head->handle_idr, f->handle);
124 if (tcf_exts_get_net(&f->exts)) 124 if (tcf_exts_get_net(&f->exts))
125 call_rcu(&f->rcu, basic_delete_filter); 125 call_rcu(&f->rcu, basic_delete_filter);
126 else 126 else
@@ -138,7 +138,7 @@ static int basic_delete(struct tcf_proto *tp, void *arg, bool *last,
138 138
139 list_del_rcu(&f->link); 139 list_del_rcu(&f->link);
140 tcf_unbind_filter(tp, &f->res); 140 tcf_unbind_filter(tp, &f->res);
141 idr_remove_ext(&head->handle_idr, f->handle); 141 idr_remove(&head->handle_idr, f->handle);
142 tcf_exts_get_net(&f->exts); 142 tcf_exts_get_net(&f->exts);
143 call_rcu(&f->rcu, basic_delete_filter); 143 call_rcu(&f->rcu, basic_delete_filter);
144 *last = list_empty(&head->flist); 144 *last = list_empty(&head->flist);
@@ -228,7 +228,7 @@ static int basic_change(struct net *net, struct sk_buff *in_skb,
228 extack); 228 extack);
229 if (err < 0) { 229 if (err < 0) {
230 if (!fold) 230 if (!fold)
231 idr_remove_ext(&head->handle_idr, fnew->handle); 231 idr_remove(&head->handle_idr, fnew->handle);
232 goto errout; 232 goto errout;
233 } 233 }
234 234