net: sched: cls_cgroup: no need to call tcf_exts_change for newly allocated struct

As the new struct just was allocated, so no need to use tcf_exts_change
to do atomic change, and we can just fill-up the unused exts struct
directly by tcf_exts_validate.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/sched/cls_cgroup.c b/net/sched/cls_cgroup.c
index ce7d38beab95ef5a0a4a74fee86b50674ba94397..df7a582775dfca6c66e2d4fb80be936c66413e80 100644 (file)
--- a/net/sched/cls_cgroup.c
+++ b/net/sched/cls_cgroup.c
@@ -76,7 +76,6 @@ static int cls_cgroup_change(struct net *net, struct sk_buff *in_skb,
        struct nlattr *tb[TCA_CGROUP_MAX + 1];
        struct cls_cgroup_head *head = rtnl_dereference(tp->root);
        struct cls_cgroup_head *new;
-       struct tcf_exts e;
        int err;
 
        if (!tca[TCA_OPTIONS])
@@ -102,22 +101,13 @@ static int cls_cgroup_change(struct net *net, struct sk_buff *in_skb,
        if (err < 0)
                goto errout;
 
-       err = tcf_exts_init(&e, TCA_CGROUP_ACT, TCA_CGROUP_POLICE);
+       err = tcf_exts_validate(net, tp, tb, tca[TCA_RATE], &new->exts, ovr);
        if (err < 0)
                goto errout;
-       err = tcf_exts_validate(net, tp, tb, tca[TCA_RATE], &e, ovr);
-       if (err < 0) {
-               tcf_exts_destroy(&e);
-               goto errout;
-       }
 
        err = tcf_em_tree_validate(tp, tb[TCA_CGROUP_EMATCHES], &new->ematches);
-       if (err < 0) {
-               tcf_exts_destroy(&e);
+       if (err < 0)
                goto errout;
-       }
-
-       tcf_exts_change(tp, &new->exts, &e);
 
        rcu_assign_pointer(tp->root, new);
        if (head)