net_sched: cls_bpf: remove unnecessary iteration and use passed arg
authorJiri Pirko <jiri@resnulli.us>
Tue, 2 Dec 2014 17:00:32 +0000 (18:00 +0100)
committerDavid S. Miller <davem@davemloft.net>
Tue, 9 Dec 2014 01:53:40 +0000 (20:53 -0500)
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Acked-by: Daniel Borkmann <dborkman@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/sched/cls_bpf.c

index eed49d1d0878d6e55d23e622e58f3bf908c9cab9..cbfaf6f8feb3b5d0b8d2724fb3c0aeed67645afc 100644 (file)
@@ -109,19 +109,12 @@ static void __cls_bpf_delete_prog(struct rcu_head *rcu)
 
 static int cls_bpf_delete(struct tcf_proto *tp, unsigned long arg)
 {
-       struct cls_bpf_head *head = rtnl_dereference(tp->root);
-       struct cls_bpf_prog *prog, *todel = (struct cls_bpf_prog *) arg;
-
-       list_for_each_entry(prog, &head->plist, link) {
-               if (prog == todel) {
-                       list_del_rcu(&prog->link);
-                       tcf_unbind_filter(tp, &prog->res);
-                       call_rcu(&prog->rcu, __cls_bpf_delete_prog);
-                       return 0;
-               }
-       }
+       struct cls_bpf_prog *prog = (struct cls_bpf_prog *) arg;
 
-       return -ENOENT;
+       list_del_rcu(&prog->link);
+       tcf_unbind_filter(tp, &prog->res);
+       call_rcu(&prog->rcu, __cls_bpf_delete_prog);
+       return 0;
 }
 
 static void cls_bpf_destroy(struct tcf_proto *tp)