Skip to contentSkip to conversation

list_for_each: net-ipv6-ip6_fib.c

PATCH Applied [email protected] 2 participants 4 messages Mar 6, 2005

Subsystems (3)
Networking Network drivers IPv4/IPv6
lore
Share & tools
lore

[email protected]

author
#0 lore raw

PATCH 1/26 list_for_each: net-ipv6-ip6_fib.c

s/for/list_for_each/
Compile tested.

Signed-off-by Domen Puncer <[email protected]>
Signed-off-by Maximilian Attems <[email protected]>
Signed-off-by Domen Puncer <[email protected]>

---

 kj-domen/net/ipv6/ip6_fib.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)
net/ipv6/ip6_fib.c renamed from net/ipv6/ip6_fib.c~list-for-each-drivers_net_ipv6_ip6_fib +1 -1
diff -puN net/ipv6/ip6_fib.c~list-for-each-drivers_net_ipv6_ip6_fib net/ipv6/ip6_fib.c
@@ -99,7 +99,7 @@ struct fib6_walker_t fib6_walker_list = 
 	.next	= &fib6_walker_list, 
 };
 
-#define FOR_WALKERS(w) for ((w)=fib6_walker_list.next; (w) != &fib6_walker_list; (w)=(w)->next)
+#define FOR_WALKERS(w) list_for_each((w), &fib6_walker_list)
 
 static __inline__ u32 fib6_new_sernum(void)
 {

_

#1 lore raw

In article <[email protected]> (at Sun, 06 Mar 2005 11:32:38 +0100), [email protected] says:

Quoted 2 lines

s/for/list_for_each/
Compile tested.

:

net/ipv6/ip6_fib.c struct fib6_walker_t fib6_walker_list = · line 105

Quoted 10 lines

+++ kj-domen/net/ipv6/ip6_fib.c 2005-03-05 16:09:09.000000000 +0100

net/ipv6/ip6_fib.c renamed from net/ipv6/ip6_fib.c~list-for-each-drivers_net_ipv6_ip6_fib +1 -1
@@ -99,7 +99,7 @@ struct fib6_walker_t fib6_walker_list = 
 	.next	= &fib6_walker_list, 
 };
 
-#define FOR_WALKERS(w) for ((w)=fib6_walker_list.next; (w) != &fib6_walker_list; (w)=(w)->next)
+#define FOR_WALKERS(w) list_for_each((w), &fib6_walker_list)
 
 static __inline__ u32 fib6_new_sernum(void)
 {

Please don't. fib6_walker_list is not for fib6_walker_t but list_head. (Or, why don't you convert fib6_walker_t to use list_head families?)

--yoshfuji

#2 lore raw

In article <[email protected]> (at Mon, 07 Mar 2005 01:40:40 +0900 (JST)), YOSHIFUJI Hideaki / 吉藤英明 <[email protected]> says:

Quoted 8 lines

net/ipv6/ip6_fib.c struct fib6_walker_t fib6_walker_list = · line 105

Quoted 6 lines
net/ipv6/ip6_fib.c renamed from net/ipv6/ip6_fib.c~list-for-each-drivers_net_ipv6_ip6_fib +1 -1
-#define FOR_WALKERS(w) for ((w)=fib6_walker_list.next; (w) != &fib6_walker_list; (w)=(w)->next)
+#define FOR_WALKERS(w) list_for_each((w), &fib6_walker_list)
 
 static __inline__ u32 fib6_new_sernum(void)
 {

Please don't. fib6_walker_list is not for fib6_walker_t but list_head.

Sorry, I meant: list_for_each is not for fib6_walker_t but list_head.

--yoshfuji

author
#3 lore raw
In reply to YOSHIFUJI Hideaki / 吉藤英明
Quoted 10 lines · On 07/03/05 01:40 +0900, YOSHIFUJI Hideaki / ?$B5HF#1QL@ wrote:

In article <[email protected]> (at Sun, 06 Mar 2005 11:32:38 +0100), [email protected] says:

Quoted 2 lines

s/for/list_for_each/
Compile tested.

:

Quoted 5 lines

+++ kj-domen/net/ipv6/ip6_fib.c 2005-03-05 16:09:09.000000000 +0100

(quoted diff) +0 -0
@@ -99,7 +99,7 @@ struct fib6_walker_t fib6_walker_list = 
 	.next	= &fib6_walker_list, 
 };
Quoted 8 lines

Review struct fib6_walker_t fib6_walker_list = · line 105

Quoted 5 lines
(quoted diff) +1 -1
-#define FOR_WALKERS(w) for ((w)=fib6_walker_list.next; (w) != &fib6_walker_list; (w)=(w)->next)
+#define FOR_WALKERS(w) list_for_each((w), &fib6_walker_list)
 
 static __inline__ u32 fib6_new_sernum(void)
 {

Please don't. fib6_walker_list is not for fib6_walker_t but list_head. (Or, why don't you convert fib6_walker_t to use list_head families?)

Makes sense.
How about this compile tested patch:

Convert to use lists from list.h.

Signed-off-by Domen Puncer <[email protected]>
net/ipv6/ip6_fib.c +3 -6
diff -purNX dontdiff c/net/ipv6/ip6_fib.c a/net/ipv6/ip6_fib.c
@@ -95,12 +95,9 @@ static __u32 rt_sernum;
 static struct timer_list ip6_fib_timer = TIMER_INITIALIZER(fib6_run_gc, 0, 0);
 
 struct fib6_walker_t fib6_walker_list = {
-	.prev	= &fib6_walker_list,
-	.next	= &fib6_walker_list, 
+	.head	= LIST_HEAD_INIT(fib6_walker_list.head),
 };
 
-#define FOR_WALKERS(w) for ((w)=fib6_walker_list.next; (w) != &fib6_walker_list; (w)=(w)->next)
-
 static __inline__ u32 fib6_new_sernum(void)
 {
 	u32 n = ++rt_sernum;

@@ -849,7 +846,7 @@ static struct fib6_node * fib6_repair_tr
 #endif
 
 		read_lock(&fib6_walker_lock);
-		FOR_WALKERS(w) {
+		list_for_each_entry(w, &fib6_walker_list.head, head) {
 			if (child == NULL) {
 				if (w->root == fn) {
 					w->root = w->node = NULL;

@@ -904,7 +901,7 @@ static void fib6_del_route(struct fib6_n
 
 	/* Adjust walkers */
 	read_lock(&fib6_walker_lock);
-	FOR_WALKERS(w) {
+	list_for_each_entry(w, &fib6_walker_list.head, head) {
 		if (w->state == FWS_C && w->leaf == rt) {
 			RT6_TRACE("walker %p adjusted by delroute\n", w);
 			w->leaf = rt->u.next;
include/net/ip6_fib.h +4 -8
diff -purNX dontdiff c/include/net/ip6_fib.h a/include/net/ip6_fib.h
@@ -21,6 +21,7 @@
 #include <net/flow.h>
 #include <linux/rtnetlink.h>
 #include <linux/spinlock.h>
+#include <linux/list.h>
 
 struct rt6_info;
 

@@ -80,7 +81,7 @@ struct rt6_info
 
 struct fib6_walker_t
 {
-	struct fib6_walker_t *prev, *next;
+	struct list_head head;
 	struct fib6_node *root, *node;
 	struct rt6_info *leaf;
 	unsigned char state;

@@ -95,19 +96,14 @@ extern rwlock_t fib6_walker_lock;
 static inline void fib6_walker_link(struct fib6_walker_t *w)
 {
 	write_lock_bh(&fib6_walker_lock);
-	w->next = fib6_walker_list.next;
-	w->prev = &fib6_walker_list;
-	w->next->prev = w;
-	w->prev->next = w;
+	list_add(&w->head, &fib6_walker_list.head);
 	write_unlock_bh(&fib6_walker_lock);
 }
 
 static inline void fib6_walker_unlink(struct fib6_walker_t *w)
 {
 	write_lock_bh(&fib6_walker_lock);
-	w->next->prev = w->prev;
-	w->prev->next = w->next;
-	w->prev = w->next = w;
+	list_del_init(&w->head);
 	write_unlock_bh(&fib6_walker_lock);
 }