evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

net: Simplify conntrack_proto_gre 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:08 +00:00 • committed by David S. Miller
parent 32b51f92d8
commit e8d0288599
1 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
net/netfilter/nf_conntrack_proto_gre.c
View file

@ -300,32 +300,24 @@ static struct nf_conntrack_l4proto nf_conntrack_l4proto_gre4 __read_mostly = {
static int proto_gre_net_init(struct net *net) static int proto_gre_net_init(struct net *net)
{ {
struct netns_proto_gre *net_gre; struct netns_proto_gre *net_gre = net_generic(net, proto_gre_net_id);
int rv;
net_gre = kmalloc(sizeof(struct netns_proto_gre), GFP_KERNEL);
if (!net_gre)
return -ENOMEM;
rwlock_init(&net_gre->keymap_lock); rwlock_init(&net_gre->keymap_lock);
INIT_LIST_HEAD(&net_gre->keymap_list); INIT_LIST_HEAD(&net_gre->keymap_list);
rv = net_assign_generic(net, proto_gre_net_id, net_gre); return 0;
if (rv < 0)
kfree(net_gre);
return rv;
} }
static void proto_gre_net_exit(struct net *net) static void proto_gre_net_exit(struct net *net)
{ {
struct netns_proto_gre *net_gre = net_generic(net, proto_gre_net_id);
nf_ct_gre_keymap_flush(net); nf_ct_gre_keymap_flush(net);
kfree(net_gre);
} }
static struct pernet_operations proto_gre_net_ops = { static struct pernet_operations proto_gre_net_ops = {
.init = proto_gre_net_init, .init = proto_gre_net_init,
.exit = proto_gre_net_exit, .exit = proto_gre_net_exit,
.id = &proto_gre_net_id,
.size = sizeof(struct netns_proto_gre),
}; };
static int __init nf_ct_proto_gre_init(void) static int __init nf_ct_proto_gre_init(void)
@ -335,7 +327,7 @@ static int __init nf_ct_proto_gre_init(void)
rv = nf_conntrack_l4proto_register(&nf_conntrack_l4proto_gre4); rv = nf_conntrack_l4proto_register(&nf_conntrack_l4proto_gre4);
if (rv < 0) if (rv < 0)
return rv; return rv;
rv = register_pernet_gen_subsys(&proto_gre_net_id, &proto_gre_net_ops); rv = register_pernet_subsys(&proto_gre_net_ops);
if (rv < 0) if (rv < 0)
nf_conntrack_l4proto_unregister(&nf_conntrack_l4proto_gre4); nf_conntrack_l4proto_unregister(&nf_conntrack_l4proto_gre4);
return rv; return rv;
@ -344,7 +336,7 @@ static int __init nf_ct_proto_gre_init(void)
static void __exit nf_ct_proto_gre_fini(void) static void __exit nf_ct_proto_gre_fini(void)
{ {
nf_conntrack_l4proto_unregister(&nf_conntrack_l4proto_gre4); nf_conntrack_l4proto_unregister(&nf_conntrack_l4proto_gre4);
unregister_pernet_gen_subsys(proto_gre_net_id, &proto_gre_net_ops); unregister_pernet_subsys(&proto_gre_net_ops);
} }
module_init(nf_ct_proto_gre_init); module_init(nf_ct_proto_gre_init);