ipv6: icmp6_dst_gc return change

Stephen Hemminger · davem330 · commit 3d0f24a74e79 · 2008-07-22T14:35:50.000-07:00
Change icmp6_dst_gc to return the one value the caller cares about rather
than using call by reference.

Signed-off-by: Stephen Hemminger &lt;shemminger@vyatta.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
@@ -68,7 +68,7 @@ extern struct rt6_info		*rt6_lookup(struct net *net,
 extern struct dst_entry *icmp6_dst_alloc(struct net_device *dev,
 					 struct neighbour *neigh,
 					 const struct in6_addr *addr);
-extern int icmp6_dst_gc(int *more);
+extern int icmp6_dst_gc(void);
 
 extern void fib6_force_start_gc(struct net *net);
 
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
@@ -1453,9 +1453,8 @@ void fib6_run_gc(unsigned long expires, struct net *net)
 		}
 		gc_args.timeout = net->ipv6.sysctl.ip6_rt_gc_interval;
 	}
-	gc_args.more = 0;
 
-	icmp6_dst_gc(&gc_args.more);
+	gc_args.more = icmp6_dst_gc();
 
 	fib6_clean_all(net, fib6_age, 0, NULL);
 
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
@@ -978,13 +978,12 @@ struct dst_entry *icmp6_dst_alloc(struct net_device *dev,
 	return &rt->u.dst;
 }
 
-int icmp6_dst_gc(int *more)
+int icmp6_dst_gc(void)
 {
 	struct dst_entry *dst, *next, **pprev;
-	int freed;
+	int more = 0;
 
 	next = NULL;
-	freed = 0;
 
 	spin_lock_bh(&icmp6_dst_lock);
 	pprev = &icmp6_dst_gc_list;
@@ -993,16 +992,15 @@ int icmp6_dst_gc(int *more)
 		if (!atomic_read(&dst->__refcnt)) {
 			*pprev = dst->next;
 			dst_free(dst);
-			freed++;
 		} else {
 			pprev = &dst->next;
-			(*more)++;
+			++more;
 		}
 	}
 
 	spin_unlock_bh(&icmp6_dst_lock);
 
-	return freed;
+	return more;
 }
 
 static int ip6_dst_gc(struct dst_ops *ops)

Original file line number	Diff line number	Diff line change
`@@ -1453,9 +1453,8 @@ void fib6_run_gc(unsigned long expires, struct net *net)`
`1453`	`1453`	`}`
`1454`	`1454`	`gc_args.timeout = net->ipv6.sysctl.ip6_rt_gc_interval;`
`1455`	`1455`	`}`
`1456`		`- gc_args.more = 0;`
`1457`	`1456`
`1458`		`- icmp6_dst_gc(&gc_args.more);`
	`1457`	`+ gc_args.more = icmp6_dst_gc();`
`1459`	`1458`
`1460`	`1459`	`fib6_clean_all(net, fib6_age, 0, NULL);`
`1461`	`1460`
Original file line number	Diff line number	Diff line change
`@@ -978,13 +978,12 @@ struct dst_entry icmp6_dst_alloc(struct net_device dev,`
`978`	`978`	`return &rt->u.dst;`
`979`	`979`	`}`
`980`	`980`
`981`		`-int icmp6_dst_gc(int *more)`
	`981`	`+int icmp6_dst_gc(void)`
`982`	`982`	`{`
`983`	`983`	`struct dst_entry dst, next, **pprev;`
`984`		`- int freed;`
	`984`	`+ int more = 0;`
`985`	`985`
`986`	`986`	`next = NULL;`
`987`		`- freed = 0;`
`988`	`987`
`989`	`988`	`spin_lock_bh(&icmp6_dst_lock);`
`990`	`989`	`pprev = &icmp6_dst_gc_list;`
`@@ -993,16 +992,15 @@ int icmp6_dst_gc(int *more)`
`993`	`992`	`if (!atomic_read(&dst->__refcnt)) {`
`994`	`993`	`*pprev = dst->next;`
`995`	`994`	`dst_free(dst);`
`996`		`- freed++;`
`997`	`995`	`} else {`
`998`	`996`	`pprev = &dst->next;`
`999`		`- (*more)++;`
	`997`	`+ ++more;`
`1000`	`998`	`}`
`1001`	`999`	`}`
`1002`	`1000`
`1003`	`1001`	`spin_unlock_bh(&icmp6_dst_lock);`
`1004`	`1002`
`1005`		`- return freed;`
	`1003`	`+ return more;`
`1006`	`1004`	`}`
`1007`	`1005`
`1008`	`1006`	`static int ip6_dst_gc(struct dst_ops *ops)`