Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net_sched: remove the first parameter from tcf_exts_destroy()

Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Acked-by: Jamal Hadi Salim <hadi@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

WANG Cong and committed by
David S. Miller
18d0264f 5804283d

+21 -21
+1 -1
include/net/pkt_cls.h
··· 137 137 int tcf_exts_validate(struct net *net, struct tcf_proto *tp, 138 138 struct nlattr **tb, struct nlattr *rate_tlv, 139 139 struct tcf_exts *exts, bool ovr); 140 - void tcf_exts_destroy(struct tcf_proto *tp, struct tcf_exts *exts); 140 + void tcf_exts_destroy(struct tcf_exts *exts); 141 141 void tcf_exts_change(struct tcf_proto *tp, struct tcf_exts *dst, 142 142 struct tcf_exts *src); 143 143 int tcf_exts_dump(struct sk_buff *skb, struct tcf_exts *exts);
+1 -1
net/sched/cls_api.c
··· 496 496 return skb->len; 497 497 } 498 498 499 - void tcf_exts_destroy(struct tcf_proto *tp, struct tcf_exts *exts) 499 + void tcf_exts_destroy(struct tcf_exts *exts) 500 500 { 501 501 #ifdef CONFIG_NET_CLS_ACT 502 502 tcf_action_destroy(&exts->actions, TCA_ACT_UNBIND);
+2 -2
net/sched/cls_basic.c
··· 94 94 struct tcf_proto *tp = f->tp; 95 95 96 96 tcf_unbind_filter(tp, &f->res); 97 - tcf_exts_destroy(tp, &f->exts); 97 + tcf_exts_destroy(&f->exts); 98 98 tcf_em_tree_destroy(tp, &f->ematches); 99 99 kfree(f); 100 100 } ··· 161 161 162 162 return 0; 163 163 errout: 164 - tcf_exts_destroy(tp, &e); 164 + tcf_exts_destroy(&e); 165 165 return err; 166 166 } 167 167
+2 -2
net/sched/cls_bpf.c
··· 93 93 static void cls_bpf_delete_prog(struct tcf_proto *tp, struct cls_bpf_prog *prog) 94 94 { 95 95 tcf_unbind_filter(tp, &prog->res); 96 - tcf_exts_destroy(tp, &prog->exts); 96 + tcf_exts_destroy(&prog->exts); 97 97 98 98 bpf_prog_destroy(prog->filter); 99 99 ··· 217 217 errout_free: 218 218 kfree(bpf_ops); 219 219 errout: 220 - tcf_exts_destroy(tp, &exts); 220 + tcf_exts_destroy(&exts); 221 221 return ret; 222 222 } 223 223
+3 -3
net/sched/cls_cgroup.c
··· 86 86 struct cls_cgroup_head, 87 87 rcu); 88 88 89 - tcf_exts_destroy(head->tp, &head->exts); 89 + tcf_exts_destroy(&head->exts); 90 90 tcf_em_tree_destroy(head->tp, &head->ematches); 91 91 kfree(head); 92 92 } ··· 135 135 136 136 err = tcf_em_tree_validate(tp, tb[TCA_CGROUP_EMATCHES], &t); 137 137 if (err < 0) { 138 - tcf_exts_destroy(tp, &e); 138 + tcf_exts_destroy(&e); 139 139 goto errout; 140 140 } 141 141 ··· 156 156 struct cls_cgroup_head *head = rtnl_dereference(tp->root); 157 157 158 158 if (head) { 159 - tcf_exts_destroy(tp, &head->exts); 159 + tcf_exts_destroy(&head->exts); 160 160 tcf_em_tree_destroy(tp, &head->ematches); 161 161 RCU_INIT_POINTER(tp->root, NULL); 162 162 kfree_rcu(head, rcu);
+2 -2
net/sched/cls_flow.c
··· 354 354 struct flow_filter *f = container_of(head, struct flow_filter, rcu); 355 355 356 356 del_timer_sync(&f->perturb_timer); 357 - tcf_exts_destroy(f->tp, &f->exts); 357 + tcf_exts_destroy(&f->exts); 358 358 tcf_em_tree_destroy(f->tp, &f->ematches); 359 359 kfree(f); 360 360 } ··· 533 533 tcf_em_tree_destroy(tp, &t); 534 534 kfree(fnew); 535 535 err1: 536 - tcf_exts_destroy(tp, &e); 536 + tcf_exts_destroy(&e); 537 537 return err; 538 538 } 539 539
+2 -2
net/sched/cls_fw.c
··· 126 126 struct tcf_proto *tp = f->tp; 127 127 128 128 tcf_unbind_filter(tp, &f->res); 129 - tcf_exts_destroy(tp, &f->exts); 129 + tcf_exts_destroy(&f->exts); 130 130 kfree(f); 131 131 } 132 132 ··· 223 223 224 224 return 0; 225 225 errout: 226 - tcf_exts_destroy(tp, &e); 226 + tcf_exts_destroy(&e); 227 227 return err; 228 228 } 229 229
+2 -2
net/sched/cls_route.c
··· 272 272 struct tcf_proto *tp = f->tp; 273 273 274 274 tcf_unbind_filter(tp, &f->res); 275 - tcf_exts_destroy(tp, &f->exts); 275 + tcf_exts_destroy(&f->exts); 276 276 kfree(f); 277 277 } 278 278 ··· 456 456 457 457 return 0; 458 458 errout: 459 - tcf_exts_destroy(tp, &e); 459 + tcf_exts_destroy(&e); 460 460 return err; 461 461 } 462 462
+2 -2
net/sched/cls_rsvp.h
··· 264 264 rsvp_delete_filter(struct tcf_proto *tp, struct rsvp_filter *f) 265 265 { 266 266 tcf_unbind_filter(tp, &f->res); 267 - tcf_exts_destroy(tp, &f->exts); 267 + tcf_exts_destroy(&f->exts); 268 268 kfree_rcu(f, rcu); 269 269 } 270 270 ··· 577 577 errout: 578 578 kfree(f); 579 579 errout2: 580 - tcf_exts_destroy(tp, &e); 580 + tcf_exts_destroy(&e); 581 581 return err; 582 582 } 583 583
+2 -2
net/sched/cls_tcindex.c
··· 169 169 rcu_assign_pointer(*walk, rtnl_dereference(f->next)); 170 170 } 171 171 tcf_unbind_filter(tp, &r->res); 172 - tcf_exts_destroy(tp, &r->exts); 172 + tcf_exts_destroy(&r->exts); 173 173 if (f) 174 174 kfree_rcu(f, rcu); 175 175 return 0; ··· 401 401 kfree(cp->h); 402 402 errout: 403 403 kfree(cp); 404 - tcf_exts_destroy(tp, &e); 404 + tcf_exts_destroy(&e); 405 405 return err; 406 406 } 407 407
+2 -2
net/sched/cls_u32.c
··· 359 359 bool free_pf) 360 360 { 361 361 tcf_unbind_filter(tp, &n->res); 362 - tcf_exts_destroy(tp, &n->exts); 362 + tcf_exts_destroy(&n->exts); 363 363 if (n->ht_down) 364 364 n->ht_down->refcnt--; 365 365 #ifdef CONFIG_CLS_U32_PERF ··· 606 606 607 607 return 0; 608 608 errout: 609 - tcf_exts_destroy(tp, &e); 609 + tcf_exts_destroy(&e); 610 610 return err; 611 611 } 612 612