From 63a0754b73b9c1e53e05930ee4123fad5d0eb466 Mon Sep 17 00:00:00 2001 From: "Eric W. Biederman" Date: Sun, 29 Nov 2009 15:46:12 +0000 Subject: [PATCH] --- yaml --- r: 172047 b: refs/heads/master c: d2b3eb630767f0b0ae21566b1b88cb512f40c647 h: refs/heads/master i: 172045: a9e51a9d69de754f3d1ffc7fb5f66fd0a88d90c5 172043: 94e2c39c6b288bd07f98ba3880f60f3ea7a991db 172039: 8d7602342b3ca3663d342a714fb1cc080f88a28c 172031: 34ad129cbe3263332d7c25d3650418a7c72dbeae v: v3 --- [refs] | 2 +- trunk/net/phonet/pn_dev.c | 16 ++++++---------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 87b22a0b5ca7..f57ed995f152 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aaab3405e03e91d0e8d30c9d327a2265a7121854 +refs/heads/master: d2b3eb630767f0b0ae21566b1b88cb512f40c647 diff --git a/trunk/net/phonet/pn_dev.c b/trunk/net/phonet/pn_dev.c index d87388c94b00..bc4a33bf2d3d 100644 --- a/trunk/net/phonet/pn_dev.c +++ b/trunk/net/phonet/pn_dev.c @@ -313,19 +313,14 @@ static struct notifier_block phonet_device_notifier = { /* Per-namespace Phonet devices handling */ static int phonet_init_net(struct net *net) { - struct phonet_net *pnn = kzalloc(sizeof(*pnn), GFP_KERNEL); - if (!pnn) - return -ENOMEM; + struct phonet_net *pnn = net_generic(net, phonet_net_id); - if (!proc_net_fops_create(net, "phonet", 0, &pn_sock_seq_fops)) { - kfree(pnn); + if (!proc_net_fops_create(net, "phonet", 0, &pn_sock_seq_fops)) return -ENOMEM; - } INIT_LIST_HEAD(&pnn->pndevs.list); mutex_init(&pnn->pndevs.lock); mutex_init(&pnn->routes.lock); - net_assign_generic(net, phonet_net_id, pnn); return 0; } @@ -349,18 +344,19 @@ static void phonet_exit_net(struct net *net) rtnl_unlock(); proc_net_remove(net, "phonet"); - kfree(pnn); } static struct pernet_operations phonet_net_ops = { .init = phonet_init_net, .exit = phonet_exit_net, + .id = &phonet_net_id, + .size = sizeof(struct phonet_net), }; /* Initialize Phonet devices list */ int __init phonet_device_init(void) { - int err = register_pernet_gen_device(&phonet_net_id, &phonet_net_ops); + int err = register_pernet_device(&phonet_net_ops); if (err) return err; @@ -375,7 +371,7 @@ void phonet_device_exit(void) { rtnl_unregister_all(PF_PHONET); unregister_netdevice_notifier(&phonet_device_notifier); - unregister_pernet_gen_device(phonet_net_id, &phonet_net_ops); + unregister_pernet_device(&phonet_net_ops); } int phonet_route_add(struct net_device *dev, u8 daddr)