[Devel] Re: [PATCH 5/12] L2 network namespace: IPv4 routing

[Cedric Le Goater]

> --- linux-2.6.19-rc6-mm2.orig/net/ipv4/fib_hash.c
> +++ linux-2.6.19-rc6-mm2/net/ipv4/fib_hash.c
> @@ -621,6 +621,11 @@ static int fn_flush_list(struct fn_zone 
>  	struct hlist_node *node, *n;
>  	struct fib_node *f;
>  	int found = 0;
> +#ifndef CONFIG_NET_NS
> +	const int destroy = 0;
> +#else
> +	const int destroy = current_net_ns->destroying;
> +#endif
>  
>  	hlist_for_each_entry_safe(f, node, n, head, fn_hash) {
>  		struct fib_alias *fa, *fa_node;
> @@ -630,7 +635,9 @@ static int fn_flush_list(struct fn_zone 
>  		list_for_each_entry_safe(fa, fa_node, &f->fn_alias, fa_list) {
>  			struct fib_info *fi = fa->fa_info;
>  
> -			if (fi && (fi->fib_flags&RTNH_F_DEAD)) {
> +			if (fi == NULL)
> +				continue;
> +			if (destroy || (fi->fib_flags&RTNH_F_DEAD)) {
>  				write_lock_bh(&fib_hash_lock);
>  				list_del(&fa->fa_list);
>  				if (list_empty(&f->fn_alias)) {

got this :)

  CC      net/ipv4/fib_hash.o
net/ipv4/fib_hash.c: In function ‘fn_flush_list’:
net/ipv4/fib_hash.c:627: error: ‘struct net_namespace’ has no member named ‘destroying’
make[2]: *** [net/ipv4/fib_hash.o] Error 1
make[1]: *** [net/ipv4] Error 2
make: *** [net] Error 2

C.
_______________________________________________
Containers mailing list
Containers at lists.osdl.org
https://lists.osdl.org/mailman/listinfo/containers