net_sched: remove unused parameter from act cleanup ops

congwang · davem330 · commit 9a63b255dffd · 2017-12-05T18:07:58.000-05:00
No one actually uses it.

Cc: Jiri Pirko &lt;jiri@mellanox.com&gt;
Cc: Jamal Hadi Salim &lt;jhs@mojatatu.com&gt;
Signed-off-by: Cong Wang &lt;xiyou.wangcong@gmail.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/include/net/act_api.h b/include/net/act_api.h
@@ -86,7 +86,7 @@ struct tc_action_ops {
 	int     (*act)(struct sk_buff *, const struct tc_action *,
 		       struct tcf_result *);
 	int     (*dump)(struct sk_buff *, struct tc_action *, int, int);
-	void	(*cleanup)(struct tc_action *, int bind);
+	void	(*cleanup)(struct tc_action *);
 	int     (*lookup)(struct net *, struct tc_action **, u32);
 	int     (*init)(struct net *net, struct nlattr *nla,
 			struct nlattr *est, struct tc_action **act, int ovr,
diff --git a/net/sched/act_api.c b/net/sched/act_api.c
@@ -99,7 +99,7 @@ int __tcf_idr_release(struct tc_action *p, bool bind, bool strict)
 		p->tcfa_refcnt--;
 		if (p->tcfa_bindcnt <= 0 && p->tcfa_refcnt <= 0) {
 			if (p->ops->cleanup)
-				p->ops->cleanup(p, bind);
+				p->ops->cleanup(p);
 			tcf_idr_remove(p->idrinfo, p);
 			ret = ACT_P_DELETED;
 		}
diff --git a/net/sched/act_bpf.c b/net/sched/act_bpf.c
@@ -357,7 +357,7 @@ static int tcf_bpf_init(struct net *net, struct nlattr *nla,
 	return ret;
 }
 
-static void tcf_bpf_cleanup(struct tc_action *act, int bind)
+static void tcf_bpf_cleanup(struct tc_action *act)
 {
 	struct tcf_bpf_cfg tmp;
 
diff --git a/net/sched/act_ife.c b/net/sched/act_ife.c
@@ -387,7 +387,7 @@ static int dump_metalist(struct sk_buff *skb, struct tcf_ife_info *ife)
 }
 
 /* under ife->tcf_lock */
-static void _tcf_ife_cleanup(struct tc_action *a, int bind)
+static void _tcf_ife_cleanup(struct tc_action *a)
 {
 	struct tcf_ife_info *ife = to_ife(a);
 	struct tcf_meta_info *e, *n;
@@ -405,13 +405,13 @@ static void _tcf_ife_cleanup(struct tc_action *a, int bind)
 	}
 }
 
-static void tcf_ife_cleanup(struct tc_action *a, int bind)
+static void tcf_ife_cleanup(struct tc_action *a)
 {
 	struct tcf_ife_info *ife = to_ife(a);
 	struct tcf_ife_params *p;
 
 	spin_lock_bh(&ife->tcf_lock);
-	_tcf_ife_cleanup(a, bind);
+	_tcf_ife_cleanup(a);
 	spin_unlock_bh(&ife->tcf_lock);
 
 	p = rcu_dereference_protected(ife->params, 1);
@@ -546,7 +546,7 @@ static int tcf_ife_init(struct net *net, struct nlattr *nla,
 			if (exists)
 				tcf_idr_release(*a, bind);
 			if (ret == ACT_P_CREATED)
-				_tcf_ife_cleanup(*a, bind);
+				_tcf_ife_cleanup(*a);
 
 			if (exists)
 				spin_unlock_bh(&ife->tcf_lock);
@@ -567,7 +567,7 @@ static int tcf_ife_init(struct net *net, struct nlattr *nla,
 		err = use_all_metadata(ife);
 		if (err) {
 			if (ret == ACT_P_CREATED)
-				_tcf_ife_cleanup(*a, bind);
+				_tcf_ife_cleanup(*a);
 
 			if (exists)
 				spin_unlock_bh(&ife->tcf_lock);
diff --git a/net/sched/act_ipt.c b/net/sched/act_ipt.c
@@ -77,7 +77,7 @@ static void ipt_destroy_target(struct xt_entry_target *t)
 	module_put(par.target->me);
 }
 
-static void tcf_ipt_release(struct tc_action *a, int bind)
+static void tcf_ipt_release(struct tc_action *a)
 {
 	struct tcf_ipt *ipt = to_ipt(a);
 	ipt_destroy_target(ipt->tcfi_t);
diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c
@@ -50,7 +50,7 @@ static bool tcf_mirred_act_wants_ingress(int action)
 	}
 }
 
-static void tcf_mirred_release(struct tc_action *a, int bind)
+static void tcf_mirred_release(struct tc_action *a)
 {
 	struct tcf_mirred *m = to_mirred(a);
 	struct net_device *dev;
diff --git a/net/sched/act_pedit.c b/net/sched/act_pedit.c
@@ -216,7 +216,7 @@ static int tcf_pedit_init(struct net *net, struct nlattr *nla,
 	return ret;
 }
 
-static void tcf_pedit_cleanup(struct tc_action *a, int bind)
+static void tcf_pedit_cleanup(struct tc_action *a)
 {
 	struct tcf_pedit *p = to_pedit(a);
 	struct tc_pedit_key *keys = p->tcfp_keys;
diff --git a/net/sched/act_sample.c b/net/sched/act_sample.c
@@ -96,7 +96,7 @@ static int tcf_sample_init(struct net *net, struct nlattr *nla,
 	return ret;
 }
 
-static void tcf_sample_cleanup(struct tc_action *a, int bind)
+static void tcf_sample_cleanup(struct tc_action *a)
 {
 	struct tcf_sample *s = to_sample(a);
 	struct psample_group *psample_group;
diff --git a/net/sched/act_simple.c b/net/sched/act_simple.c
@@ -47,7 +47,7 @@ static int tcf_simp(struct sk_buff *skb, const struct tc_action *a,
 	return d->tcf_action;
 }
 
-static void tcf_simp_release(struct tc_action *a, int bind)
+static void tcf_simp_release(struct tc_action *a)
 {
 	struct tcf_defact *d = to_defact(a);
 	kfree(d->tcfd_defdata);
diff --git a/net/sched/act_skbmod.c b/net/sched/act_skbmod.c
@@ -184,7 +184,7 @@ static int tcf_skbmod_init(struct net *net, struct nlattr *nla,
 	return ret;
 }
 
-static void tcf_skbmod_cleanup(struct tc_action *a, int bind)
+static void tcf_skbmod_cleanup(struct tc_action *a)
 {
 	struct tcf_skbmod *d = to_skbmod(a);
 	struct tcf_skbmod_params  *p;
diff --git a/net/sched/act_tunnel_key.c b/net/sched/act_tunnel_key.c
@@ -201,7 +201,7 @@ static int tunnel_key_init(struct net *net, struct nlattr *nla,
 	return ret;
 }
 
-static void tunnel_key_release(struct tc_action *a, int bind)
+static void tunnel_key_release(struct tc_action *a)
 {
 	struct tcf_tunnel_key *t = to_tunnel_key(a);
 	struct tcf_tunnel_key_params *params;
diff --git a/net/sched/act_vlan.c b/net/sched/act_vlan.c
@@ -219,7 +219,7 @@ static int tcf_vlan_init(struct net *net, struct nlattr *nla,
 	return ret;
 }
 
-static void tcf_vlan_cleanup(struct tc_action *a, int bind)
+static void tcf_vlan_cleanup(struct tc_action *a)
 {
 	struct tcf_vlan *v = to_vlan(a);
 	struct tcf_vlan_params *p;

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ int __tcf_idr_release(struct tc_action *p, bool bind, bool strict)`
`99`	`99`	`p->tcfa_refcnt--;`
`100`	`100`	`if (p->tcfa_bindcnt <= 0 && p->tcfa_refcnt <= 0) {`
`101`	`101`	`if (p->ops->cleanup)`
`102`		`- p->ops->cleanup(p, bind);`
	`102`	`+ p->ops->cleanup(p);`
`103`	`103`	`tcf_idr_remove(p->idrinfo, p);`
`104`	`104`	`ret = ACT_P_DELETED;`
`105`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -357,7 +357,7 @@ static int tcf_bpf_init(struct net net, struct nlattr nla,`
`357`	`357`	`return ret;`
`358`	`358`	`}`
`359`	`359`
`360`		`-static void tcf_bpf_cleanup(struct tc_action *act, int bind)`
	`360`	`+static void tcf_bpf_cleanup(struct tc_action *act)`
`361`	`361`	`{`
`362`	`362`	`struct tcf_bpf_cfg tmp;`
`363`	`363`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ static void ipt_destroy_target(struct xt_entry_target *t)`
`77`	`77`	`module_put(par.target->me);`
`78`	`78`	`}`
`79`	`79`
`80`		`-static void tcf_ipt_release(struct tc_action *a, int bind)`
	`80`	`+static void tcf_ipt_release(struct tc_action *a)`
`81`	`81`	`{`
`82`	`82`	`struct tcf_ipt *ipt = to_ipt(a);`
`83`	`83`	`ipt_destroy_target(ipt->tcfi_t);`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ static bool tcf_mirred_act_wants_ingress(int action)`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`
`53`		`-static void tcf_mirred_release(struct tc_action *a, int bind)`
	`53`	`+static void tcf_mirred_release(struct tc_action *a)`
`54`	`54`	`{`
`55`	`55`	`struct tcf_mirred *m = to_mirred(a);`
`56`	`56`	`struct net_device *dev;`
Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ static int tcf_pedit_init(struct net net, struct nlattr nla,`
`216`	`216`	`return ret;`
`217`	`217`	`}`
`218`	`218`
`219`		`-static void tcf_pedit_cleanup(struct tc_action *a, int bind)`
	`219`	`+static void tcf_pedit_cleanup(struct tc_action *a)`
`220`	`220`	`{`
`221`	`221`	`struct tcf_pedit *p = to_pedit(a);`
`222`	`222`	`struct tc_pedit_key *keys = p->tcfp_keys;`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ static int tcf_sample_init(struct net net, struct nlattr nla,`
`96`	`96`	`return ret;`
`97`	`97`	`}`
`98`	`98`
`99`		`-static void tcf_sample_cleanup(struct tc_action *a, int bind)`
	`99`	`+static void tcf_sample_cleanup(struct tc_action *a)`
`100`	`100`	`{`
`101`	`101`	`struct tcf_sample *s = to_sample(a);`
`102`	`102`	`struct psample_group *psample_group;`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ static int tcf_simp(struct sk_buff skb, const struct tc_action a,`
`47`	`47`	`return d->tcf_action;`
`48`	`48`	`}`
`49`	`49`
`50`		`-static void tcf_simp_release(struct tc_action *a, int bind)`
	`50`	`+static void tcf_simp_release(struct tc_action *a)`
`51`	`51`	`{`
`52`	`52`	`struct tcf_defact *d = to_defact(a);`
`53`	`53`	`kfree(d->tcfd_defdata);`
Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ static int tcf_skbmod_init(struct net net, struct nlattr nla,`
`184`	`184`	`return ret;`
`185`	`185`	`}`
`186`	`186`
`187`		`-static void tcf_skbmod_cleanup(struct tc_action *a, int bind)`
	`187`	`+static void tcf_skbmod_cleanup(struct tc_action *a)`
`188`	`188`	`{`
`189`	`189`	`struct tcf_skbmod *d = to_skbmod(a);`
`190`	`190`	`struct tcf_skbmod_params *p;`
Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ static int tunnel_key_init(struct net net, struct nlattr nla,`
`201`	`201`	`return ret;`
`202`	`202`	`}`
`203`	`203`
`204`		`-static void tunnel_key_release(struct tc_action *a, int bind)`
	`204`	`+static void tunnel_key_release(struct tc_action *a)`
`205`	`205`	`{`
`206`	`206`	`struct tcf_tunnel_key *t = to_tunnel_key(a);`
`207`	`207`	`struct tcf_tunnel_key_params *params;`
Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,7 @@ static int tcf_vlan_init(struct net net, struct nlattr nla,`
`219`	`219`	`return ret;`
`220`	`220`	`}`
`221`	`221`
`222`		`-static void tcf_vlan_cleanup(struct tc_action *a, int bind)`
	`222`	`+static void tcf_vlan_cleanup(struct tc_action *a)`
`223`	`223`	`{`
`224`	`224`	`struct tcf_vlan *v = to_vlan(a);`
`225`	`225`	`struct tcf_vlan_params *p;`