net: sched: cls: use nla_nest_cancel instead of nlmsg_trim

jpirko · davem330 · commit 6ea3b446b936 · 2014-12-09T21:49:58.000-05:00
To cancel nesting, this function is more convenient.

Signed-off-by: Jiri Pirko &lt;jiri@resnulli.us&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/net/sched/cls_cgroup.c b/net/sched/cls_cgroup.c
@@ -177,7 +177,6 @@ static int cls_cgroup_dump(struct net *net, struct tcf_proto *tp, unsigned long
 			   struct sk_buff *skb, struct tcmsg *t)
 {
 	struct cls_cgroup_head *head = rtnl_dereference(tp->root);
-	unsigned char *b = skb_tail_pointer(skb);
 	struct nlattr *nest;
 
 	t->tcm_handle = head->handle;
@@ -198,7 +197,7 @@ static int cls_cgroup_dump(struct net *net, struct tcf_proto *tp, unsigned long
 	return skb->len;
 
 nla_put_failure:
-	nlmsg_trim(skb, b);
+	nla_nest_cancel(skb, nest);
 	return -1;
 }
 
diff --git a/net/sched/cls_flow.c b/net/sched/cls_flow.c
@@ -638,7 +638,7 @@ static int flow_dump(struct net *net, struct tcf_proto *tp, unsigned long fh,
 	return skb->len;
 
 nla_put_failure:
-	nlmsg_trim(skb, nest);
+	nla_nest_cancel(skb, nest);
 	return -1;
 }
 
diff --git a/net/sched/cls_fw.c b/net/sched/cls_fw.c
@@ -356,7 +356,6 @@ static int fw_dump(struct net *net, struct tcf_proto *tp, unsigned long fh,
 {
 	struct fw_head *head = rtnl_dereference(tp->root);
 	struct fw_filter *f = (struct fw_filter *)fh;
-	unsigned char *b = skb_tail_pointer(skb);
 	struct nlattr *nest;
 
 	if (f == NULL)
@@ -397,7 +396,7 @@ static int fw_dump(struct net *net, struct tcf_proto *tp, unsigned long fh,
 	return skb->len;
 
 nla_put_failure:
-	nlmsg_trim(skb, b);
+	nla_nest_cancel(skb, nest);
 	return -1;
 }
 
diff --git a/net/sched/cls_route.c b/net/sched/cls_route.c
@@ -593,7 +593,6 @@ static int route4_dump(struct net *net, struct tcf_proto *tp, unsigned long fh,
 		       struct sk_buff *skb, struct tcmsg *t)
 {
 	struct route4_filter *f = (struct route4_filter *)fh;
-	unsigned char *b = skb_tail_pointer(skb);
 	struct nlattr *nest;
 	u32 id;
 
@@ -635,7 +634,7 @@ static int route4_dump(struct net *net, struct tcf_proto *tp, unsigned long fh,
 	return skb->len;
 
 nla_put_failure:
-	nlmsg_trim(skb, b);
+	nla_nest_cancel(skb, nest);
 	return -1;
 }
 
diff --git a/net/sched/cls_rsvp.h b/net/sched/cls_rsvp.h
@@ -653,7 +653,6 @@ static int rsvp_dump(struct net *net, struct tcf_proto *tp, unsigned long fh,
 {
 	struct rsvp_filter *f = (struct rsvp_filter *)fh;
 	struct rsvp_session *s;
-	unsigned char *b = skb_tail_pointer(skb);
 	struct nlattr *nest;
 	struct tc_rsvp_pinfo pinfo;
 
@@ -694,7 +693,7 @@ static int rsvp_dump(struct net *net, struct tcf_proto *tp, unsigned long fh,
 	return skb->len;
 
 nla_put_failure:
-	nlmsg_trim(skb, b);
+	nla_nest_cancel(skb, nest);
 	return -1;
 }
 
diff --git a/net/sched/cls_tcindex.c b/net/sched/cls_tcindex.c
@@ -489,11 +489,10 @@ static int tcindex_dump(struct net *net, struct tcf_proto *tp, unsigned long fh,
 {
 	struct tcindex_data *p = rtnl_dereference(tp->root);
 	struct tcindex_filter_result *r = (struct tcindex_filter_result *) fh;
-	unsigned char *b = skb_tail_pointer(skb);
 	struct nlattr *nest;
 
-	pr_debug("tcindex_dump(tp %p,fh 0x%lx,skb %p,t %p),p %p,r %p,b %p\n",
-		 tp, fh, skb, t, p, r, b);
+	pr_debug("tcindex_dump(tp %p,fh 0x%lx,skb %p,t %p),p %p,r %p\n",
+		 tp, fh, skb, t, p, r);
 	pr_debug("p->perfect %p p->h %p\n", p->perfect, p->h);
 
 	nest = nla_nest_start(skb, TCA_OPTIONS);
@@ -543,7 +542,7 @@ static int tcindex_dump(struct net *net, struct tcf_proto *tp, unsigned long fh,
 	return skb->len;
 
 nla_put_failure:
-	nlmsg_trim(skb, b);
+	nla_nest_cancel(skb, nest);
 	return -1;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,6 @@ static int cls_cgroup_dump(struct net net, struct tcf_proto tp, unsigned long`
`177`	`177`	`struct sk_buff skb, struct tcmsg t)`
`178`	`178`	`{`
`179`	`179`	`struct cls_cgroup_head *head = rtnl_dereference(tp->root);`
`180`		`- unsigned char *b = skb_tail_pointer(skb);`
`181`	`180`	`struct nlattr *nest;`
`182`	`181`
`183`	`182`	`t->tcm_handle = head->handle;`
`@@ -198,7 +197,7 @@ static int cls_cgroup_dump(struct net net, struct tcf_proto tp, unsigned long`
`198`	`197`	`return skb->len;`
`199`	`198`
`200`	`199`	`nla_put_failure:`
`201`		`- nlmsg_trim(skb, b);`
	`200`	`+ nla_nest_cancel(skb, nest);`
`202`	`201`	`return -1;`
`203`	`202`	`}`
`204`	`203`
Original file line number	Diff line number	Diff line change
`@@ -638,7 +638,7 @@ static int flow_dump(struct net net, struct tcf_proto tp, unsigned long fh,`
`638`	`638`	`return skb->len;`
`639`	`639`
`640`	`640`	`nla_put_failure:`
`641`		`- nlmsg_trim(skb, nest);`
	`641`	`+ nla_nest_cancel(skb, nest);`
`642`	`642`	`return -1;`
`643`	`643`	`}`
`644`	`644`
Original file line number	Diff line number	Diff line change
`@@ -356,7 +356,6 @@ static int fw_dump(struct net net, struct tcf_proto tp, unsigned long fh,`
`356`	`356`	`{`
`357`	`357`	`struct fw_head *head = rtnl_dereference(tp->root);`
`358`	`358`	`struct fw_filter f = (struct fw_filter )fh;`
`359`		`- unsigned char *b = skb_tail_pointer(skb);`
`360`	`359`	`struct nlattr *nest;`
`361`	`360`
`362`	`361`	`if (f == NULL)`
`@@ -397,7 +396,7 @@ static int fw_dump(struct net net, struct tcf_proto tp, unsigned long fh,`
`397`	`396`	`return skb->len;`
`398`	`397`
`399`	`398`	`nla_put_failure:`
`400`		`- nlmsg_trim(skb, b);`
	`399`	`+ nla_nest_cancel(skb, nest);`
`401`	`400`	`return -1;`
`402`	`401`	`}`
`403`	`402`
Original file line number	Diff line number	Diff line change
`@@ -593,7 +593,6 @@ static int route4_dump(struct net net, struct tcf_proto tp, unsigned long fh,`
`593`	`593`	`struct sk_buff skb, struct tcmsg t)`
`594`	`594`	`{`
`595`	`595`	`struct route4_filter f = (struct route4_filter )fh;`
`596`		`- unsigned char *b = skb_tail_pointer(skb);`
`597`	`596`	`struct nlattr *nest;`
`598`	`597`	`u32 id;`
`599`	`598`
`@@ -635,7 +634,7 @@ static int route4_dump(struct net net, struct tcf_proto tp, unsigned long fh,`
`635`	`634`	`return skb->len;`
`636`	`635`
`637`	`636`	`nla_put_failure:`
`638`		`- nlmsg_trim(skb, b);`
	`637`	`+ nla_nest_cancel(skb, nest);`
`639`	`638`	`return -1;`
`640`	`639`	`}`
`641`	`640`
Original file line number	Diff line number	Diff line change
`@@ -653,7 +653,6 @@ static int rsvp_dump(struct net net, struct tcf_proto tp, unsigned long fh,`
`653`	`653`	`{`
`654`	`654`	`struct rsvp_filter f = (struct rsvp_filter )fh;`
`655`	`655`	`struct rsvp_session *s;`
`656`		`- unsigned char *b = skb_tail_pointer(skb);`
`657`	`656`	`struct nlattr *nest;`
`658`	`657`	`struct tc_rsvp_pinfo pinfo;`
`659`	`658`
`@@ -694,7 +693,7 @@ static int rsvp_dump(struct net net, struct tcf_proto tp, unsigned long fh,`
`694`	`693`	`return skb->len;`
`695`	`694`
`696`	`695`	`nla_put_failure:`
`697`		`- nlmsg_trim(skb, b);`
	`696`	`+ nla_nest_cancel(skb, nest);`
`698`	`697`	`return -1;`
`699`	`698`	`}`
`700`	`699`