Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8cc62513 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

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: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6839da32

net/sched/cls_cgroup.c

+2 −12
Original line number Diff line number Diff line
@@ -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)