mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-13 14:14:37 +00:00
Code Issues Releases Wiki Activity

net: Simplify pppoe 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:10 +00:00 committed by David S. Miller
parent 741a6fa210
commit c879a6fcd6
1 changed files with 8 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
drivers/net/pppoe.c
View file

@ -1139,59 +1139,37 @@ static struct pppox_proto pppoe_proto = {
static __net_init int pppoe_init_net(struct net *net) static __net_init int pppoe_init_net(struct net *net)
{ {
struct pppoe_net *pn; struct pppoe_net *pn = pppoe_pernet(net);
struct proc_dir_entry *pde; struct proc_dir_entry *pde;
int err;
pn = kzalloc(sizeof(*pn), GFP_KERNEL);
if (!pn)
return -ENOMEM;
rwlock_init(&pn->hash_lock); rwlock_init(&pn->hash_lock);
err = net_assign_generic(net, pppoe_net_id, pn);
if (err)
goto out;
pde = proc_net_fops_create(net, "pppoe", S_IRUGO, &pppoe_seq_fops); pde = proc_net_fops_create(net, "pppoe", S_IRUGO, &pppoe_seq_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 pppoe_exit_net(struct net *net) static __net_exit void pppoe_exit_net(struct net *net)
{ {
struct pppoe_net *pn;
proc_net_remove(net, "pppoe"); proc_net_remove(net, "pppoe");
pn = net_generic(net, pppoe_net_id);
/*
* if someone has cached our net then
* further net_generic call will return NULL
*/
net_assign_generic(net, pppoe_net_id, NULL);
kfree(pn);
} }
static struct pernet_operations pppoe_net_ops = { static struct pernet_operations pppoe_net_ops = {
.init = pppoe_init_net, .init = pppoe_init_net,
.exit = pppoe_exit_net, .exit = pppoe_exit_net,
.id = &pppoe_net_id,
.size = sizeof(struct pppoe_net),
}; };
static int __init pppoe_init(void) static int __init pppoe_init(void)
{ {
int err; int err;
err = register_pernet_gen_device(&pppoe_net_id, &pppoe_net_ops); err = register_pernet_device(&pppoe_net_ops);
if (err) if (err)
goto out; goto out;
@ -1212,7 +1190,7 @@ static int __init pppoe_init(void)
out_unregister_pppoe_proto: out_unregister_pppoe_proto:
proto_unregister(&pppoe_sk_proto); proto_unregister(&pppoe_sk_proto);
out_unregister_net_ops: out_unregister_net_ops:
unregister_pernet_gen_device(pppoe_net_id, &pppoe_net_ops); unregister_pernet_device(&pppoe_net_ops);
out: out:
return err; return err;
} }
@ -1224,7 +1202,7 @@ static void __exit pppoe_exit(void)
dev_remove_pack(&pppoes_ptype); dev_remove_pack(&pppoes_ptype);
unregister_pppox_proto(PX_PROTO_OE); unregister_pppox_proto(PX_PROTO_OE);
proto_unregister(&pppoe_sk_proto); proto_unregister(&pppoe_sk_proto);
unregister_pernet_gen_device(pppoe_net_id, &pppoe_net_ops); unregister_pernet_device(&pppoe_net_ops);
} }
module_init(pppoe_init); module_init(pppoe_init);