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

Commit 0e991ec6 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

tc: propogate errors from tcf_hash_create 



Allow tcf_hash_create to return different errors on estimator failure.

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4ef8e768

net/sched/act_api.c

+13 −5
Original line number Diff line number Diff line
@@ -214,12 +214,14 @@ struct tcf_common *tcf_hash_check(u32 index, struct tc_action *a, int bind, 
}

EXPORT_SYMBOL(tcf_hash_check);



struct tcf_common *tcf_hash_create(u32 index, struct nlattr *est, struct tc_action *a, int size, int bind, u32 *idx_gen, struct tcf_hashinfo *hinfo)

struct tcf_common *tcf_hash_create(u32 index, struct nlattr *est,

				   struct tc_action *a, int size, int bind,

				   u32 *idx_gen, struct tcf_hashinfo *hinfo)

{

	struct tcf_common *p = kzalloc(size, GFP_KERNEL);



	if (unlikely(!p))

		return p;

		return ERR_PTR(-ENOMEM);

	p->tcfc_refcnt = 1;

	if (bind)

		p->tcfc_bindcnt = 1;
@@ -228,9 +230,15 @@ struct tcf_common *tcf_hash_create(u32 index, struct nlattr *est, struct tc_acti 
	p->tcfc_index = index ? index : tcf_hash_new_index(idx_gen, hinfo);

	p->tcfc_tm.install = jiffies;

	p->tcfc_tm.lastuse = jiffies;

	if (est)

		gen_new_estimator(&p->tcfc_bstats, &p->tcfc_rate_est,

	if (est) {

		int err = gen_new_estimator(&p->tcfc_bstats, &p->tcfc_rate_est,

					    &p->tcfc_lock, est);

		if (err) {

			kfree(p);

			return ERR_PTR(err);

		}

	}



	a->priv = (void *) p;

	return p;

}

net/sched/act_gact.c

+2 −2
Original line number Diff line number Diff line
@@ -88,8 +88,8 @@ static int tcf_gact_init(struct nlattr *nla, struct nlattr *est, 
	if (!pc) {

		pc = tcf_hash_create(parm->index, est, a, sizeof(*gact),

				     bind, &gact_idx_gen, &gact_hash_info);

		if (unlikely(!pc))

			return -ENOMEM;

		if (IS_ERR(pc))

		    return PTR_ERR(pc);

		ret = ACT_P_CREATED;

	} else {

		if (!ovr) {

net/sched/act_ipt.c

+2 −2
Original line number Diff line number Diff line
@@ -136,8 +136,8 @@ static int tcf_ipt_init(struct nlattr *nla, struct nlattr *est, 
	if (!pc) {

		pc = tcf_hash_create(index, est, a, sizeof(*ipt), bind,

				     &ipt_idx_gen, &ipt_hash_info);

		if (unlikely(!pc))

			return -ENOMEM;

		if (IS_ERR(pc))

		    return PTR_ERR(pc);

		ret = ACT_P_CREATED;

	} else {

		if (!ovr) {

net/sched/act_mirred.c

+2 −2
Original line number Diff line number Diff line
@@ -105,8 +105,8 @@ static int tcf_mirred_init(struct nlattr *nla, struct nlattr *est, 
			return -EINVAL;

		pc = tcf_hash_create(parm->index, est, a, sizeof(*m), bind,

				     &mirred_idx_gen, &mirred_hash_info);

		if (unlikely(!pc))

			return -ENOMEM;

		if (IS_ERR(pc))

		    return PTR_ERR(pc);

		ret = ACT_P_CREATED;

	} else {

		if (!ovr) {

net/sched/act_nat.c

+2 −2
Original line number Diff line number Diff line
@@ -68,8 +68,8 @@ static int tcf_nat_init(struct nlattr *nla, struct nlattr *est, 
	if (!pc) {

		pc = tcf_hash_create(parm->index, est, a, sizeof(*p), bind,

				     &nat_idx_gen, &nat_hash_info);

		if (unlikely(!pc))

			return -ENOMEM;

		if (IS_ERR(pc))

		    return PTR_ERR(pc);

		p = to_tcf_nat(pc);

		ret = ACT_P_CREATED;

	} else {