Commit4392053

congwang

authored and

davem330

committed

net_sched: remove useless NULL to tp->root

There is no need to NULL tp->root in ->destroy(), since tp isgoing to be freed very soon, and existing readers are stillsafe to read them.For cls_route, we always init its tp->root, so it can't be NULL,we can drop more useless code.Cc: Daniel Borkmann <daniel@iogearbox.net>Cc: John Fastabend <john.fastabend@gmail.com>Cc: Jamal Hadi Salim <jhs@mojatatu.com>Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>Signed-off-by: David S. Miller <davem@davemloft.net>

1 parent763dbf6 commit4392053Copy full SHA for 4392053

File tree

3 files changed

-20

lines changed

net/sched

3 files changed

-20

lines changed

`‎net/sched/cls_fw.c‎`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,6 @@ static void fw_destroy(struct tcf_proto *tp)`
`144`	`144`	`call_rcu(&f->rcu,fw_delete_filter);`
`145`	`145`	`}`
`146`	`146`	`}`
`147`		`-RCU_INIT_POINTER(tp->root,NULL);`
`148`	`147`	`kfree_rcu(head,rcu);`
`149`	`148`	`}`
`150`	`149`

`‎net/sched/cls_route.c‎`

Lines changed: 0 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -140,8 +140,6 @@ static int route4_classify(struct sk_buff skb, const struct tcf_proto tp,`
`140`	`140`	`gotofailure;`
`141`	`141`
`142`	`142`	`id=dst->tclassid;`
`143`		`-if (head==NULL)`
`144`		`-gotoold_method;`
`145`	`143`
`146`	`144`	`iif=inet_iif(skb);`
`147`	`145`
`@@ -194,15 +192,6 @@ static int route4_classify(struct sk_buff skb, const struct tcf_proto tp,`
`194`	`192`	`route4_set_fastmap(head,id,iif,ROUTE4_FAILURE);`
`195`	`193`	`failure:`
`196`	`194`	`return-1;`
`197`		`-`
`198`		`-old_method:`
`199`		`-if (id&& (TC_H_MAJ(id)==0\|\|`
`200`		`- !(TC_H_MAJ(id^tp->q->handle)))) {`
`201`		`-res->classid=id;`
`202`		`-res->class=0;`
`203`		`-return0;`
`204`		`-}`
`205`		`-return-1;`
`206`	`195`	`}`
`207`	`196`
`208`	`197`	`staticinlineu32to_hash(u32id)`
`@@ -234,9 +223,6 @@ static unsigned long route4_get(struct tcf_proto *tp, u32 handle)`
`234`	`223`	`structroute4_filter*f;`
`235`	`224`	`unsignedinth1,h2;`
`236`	`225`
`237`		`-if (!head)`
`238`		`-return0;`
`239`		`-`
`240`	`226`	`h1=to_hash(handle);`
`241`	`227`	`if (h1>256)`
`242`	`228`	`return0;`
`@@ -305,7 +291,6 @@ static void route4_destroy(struct tcf_proto *tp)`
`305`	`291`	`kfree_rcu(b,rcu);`
`306`	`292`	`}`
`307`	`293`	`}`
`308`		`-RCU_INIT_POINTER(tp->root,NULL);`
`309`	`294`	`kfree_rcu(head,rcu);`
`310`	`295`	`}`
`311`	`296`

`‎net/sched/cls_rsvp.h‎`

Lines changed: 0 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -152,8 +152,6 @@ static int rsvp_classify(struct sk_buff skb, const struct tcf_proto tp,`
`152`	`152`	`return-1;`
`153`	`153`	`nhptr=ip_hdr(skb);`
`154`	`154`	`#endif`
`155`		`-if (unlikely(!head))`
`156`		`-return-1;`
`157`	`155`	`restart:`
`158`	`156`
`159`	`157`	`#ifRSVP_DST_LEN==4`
`@@ -310,8 +308,6 @@ static void rsvp_destroy(struct tcf_proto *tp)`
`310`	`308`	`if (data==NULL)`
`311`	`309`	`return;`
`312`	`310`
`313`		`-RCU_INIT_POINTER(tp->root,NULL);`
`314`		`-`
`315`	`311`	`for (h1=0;h1<256;h1++) {`
`316`	`312`	`structrsvp_session*s;`
`317`	`313`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit4392053

File tree

3 files changed

3 files changed

`‎net/sched/cls_fw.c‎`

`‎net/sched/cls_route.c‎`

`‎net/sched/cls_rsvp.h‎`

0 commit comments