net: Simplify ip6_tunnel pernet operations.
Eric W. Biederman [Sun, 29 Nov 2009 15:46:15 +0000 (15:46 +0000)]
Take advantage of the new pernet automatic storage management,
and stop using compatibility network namespace functions.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

net/ipv6/ip6_tunnel.c

index e5c0f6b..d453d07 100644 (file)
@@ -1409,17 +1409,8 @@ static void ip6_tnl_destroy_tunnels(struct ip6_tnl_net *ip6n)
 
 static int ip6_tnl_init_net(struct net *net)
 {
+       struct ip6_tnl_net *ip6n = net_generic(net, ip6_tnl_net_id);
        int err;
-       struct ip6_tnl_net *ip6n;
-
-       err = -ENOMEM;
-       ip6n = kzalloc(sizeof(struct ip6_tnl_net), GFP_KERNEL);
-       if (ip6n == NULL)
-               goto err_alloc;
-
-       err = net_assign_generic(net, ip6_tnl_net_id, ip6n);
-       if (err < 0)
-               goto err_assign;
 
        ip6n->tnls[0] = ip6n->tnls_wc;
        ip6n->tnls[1] = ip6n->tnls_r_l;
@@ -1442,27 +1433,23 @@ static int ip6_tnl_init_net(struct net *net)
 err_register:
        free_netdev(ip6n->fb_tnl_dev);
 err_alloc_dev:
-       /* nothing */
-err_assign:
-       kfree(ip6n);
-err_alloc:
        return err;
 }
 
 static void ip6_tnl_exit_net(struct net *net)
 {
-       struct ip6_tnl_net *ip6n;
+       struct ip6_tnl_net *ip6n = net_generic(net, ip6_tnl_net_id);
 
-       ip6n = net_generic(net, ip6_tnl_net_id);
        rtnl_lock();
        ip6_tnl_destroy_tunnels(ip6n);
        rtnl_unlock();
-       kfree(ip6n);
 }
 
 static struct pernet_operations ip6_tnl_net_ops = {
        .init = ip6_tnl_init_net,
        .exit = ip6_tnl_exit_net,
+       .id   = &ip6_tnl_net_id,
+       .size = sizeof(struct ip6_tnl_net),
 };
 
 /**
@@ -1487,7 +1474,7 @@ static int __init ip6_tunnel_init(void)
                goto unreg_ip4ip6;
        }
 
-       err = register_pernet_gen_device(&ip6_tnl_net_id, &ip6_tnl_net_ops);
+       err = register_pernet_device(&ip6_tnl_net_ops);
        if (err < 0)
                goto err_pernet;
        return 0;
@@ -1511,7 +1498,7 @@ static void __exit ip6_tunnel_cleanup(void)
        if (xfrm6_tunnel_deregister(&ip6ip6_handler, AF_INET6))
                printk(KERN_INFO "ip6_tunnel close: can't deregister ip6ip6\n");
 
-       unregister_pernet_gen_device(ip6_tnl_net_id, &ip6_tnl_net_ops);
+       unregister_pernet_device(&ip6_tnl_net_ops);
 }
 
 module_init(ip6_tunnel_init);