leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: Simplify pppol2tp pernet operations.

Browse Source 
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>
This commit is contained in:
Eric W. Biederman 2009-11-29 15:46:11 +00:00 committed by David S. Miller
parent c879a6fcd6
commit aaab3405e0
1 changed files with 7 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/net/pppol2tp.c
View File

@ -2605,53 +2605,31 @@ static struct pppox_proto pppol2tp_proto = {
static __net_init int pppol2tp_init_net(struct net *net) static __net_init int pppol2tp_init_net(struct net *net)
{ {
struct pppol2tp_net *pn; struct pppol2tp_net *pn = pppol2tp_pernet(net);
struct proc_dir_entry *pde; struct proc_dir_entry *pde;
int err;
pn = kzalloc(sizeof(*pn), GFP_KERNEL);
if (!pn)
return -ENOMEM;
INIT_LIST_HEAD(&pn->pppol2tp_tunnel_list); INIT_LIST_HEAD(&pn->pppol2tp_tunnel_list);
rwlock_init(&pn->pppol2tp_tunnel_list_lock); rwlock_init(&pn->pppol2tp_tunnel_list_lock);
err = net_assign_generic(net, pppol2tp_net_id, pn);
if (err)
goto out;
pde = proc_net_fops_create(net, "pppol2tp", S_IRUGO, &pppol2tp_proc_fops); pde = proc_net_fops_create(net, "pppol2tp", S_IRUGO, &pppol2tp_proc_fops);
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
if (!pde) { if (!pde)
err = -ENOMEM; return -ENOMEM;
goto out;
}
#endif #endif
return 0; return 0;
out:
kfree(pn);
return err;
} }
static __net_exit void pppol2tp_exit_net(struct net *net) static __net_exit void pppol2tp_exit_net(struct net *net)
{ {
struct pppoe_net *pn;
proc_net_remove(net, "pppol2tp"); proc_net_remove(net, "pppol2tp");
pn = net_generic(net, pppol2tp_net_id);
/*
* if someone has cached our net then
* further net_generic call will return NULL
*/
net_assign_generic(net, pppol2tp_net_id, NULL);
kfree(pn);
} }
static struct pernet_operations pppol2tp_net_ops = { static struct pernet_operations pppol2tp_net_ops = {
.init = pppol2tp_init_net, .init = pppol2tp_init_net,
.exit = pppol2tp_exit_net, .exit = pppol2tp_exit_net,
.id = &pppol2tp_net_id,
.size = sizeof(struct pppol2tp_net),
}; };
static int __init pppol2tp_init(void) static int __init pppol2tp_init(void)
@ -2665,7 +2643,7 @@ static int __init pppol2tp_init(void)
if (err) if (err)
goto out_unregister_pppol2tp_proto; goto out_unregister_pppol2tp_proto;
err = register_pernet_gen_device(&pppol2tp_net_id, &pppol2tp_net_ops); err = register_pernet_device(&pppol2tp_net_ops);
if (err) if (err)
goto out_unregister_pppox_proto; goto out_unregister_pppox_proto;
@ -2684,7 +2662,7 @@ out_unregister_pppol2tp_proto:
static void __exit pppol2tp_exit(void) static void __exit pppol2tp_exit(void)
{ {
unregister_pppox_proto(PX_PROTO_OL2TP); unregister_pppox_proto(PX_PROTO_OL2TP);
unregister_pernet_gen_device(pppol2tp_net_id, &pppol2tp_net_ops); unregister_pernet_device(&pppol2tp_net_ops);
proto_unregister(&pppol2tp_sk_proto); proto_unregister(&pppol2tp_sk_proto);
} }