diff options
| author |   Pavel Emelyanov <xemul@openvz.org> | 2008-02-09 23:19:14 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2008-02-09 23:19:14 -0800 |
| commit | 61145aa1a12401ac71bcc450a58c773dd6e2bfb9 (patch) | |
| tree | 8e9612d88158030e3a62ca76d95c3304948fc4ab /net/key | |
| parent | pppol2tp: fix printk warnings (diff) | |
| download | linux-dev-61145aa1a12401ac71bcc450a58c773dd6e2bfb9.tar.xz linux-dev-61145aa1a12401ac71bcc450a58c773dd6e2bfb9.zip | |
[KEY]: Clean up proc files creation a bit.
Mainly this removes ifdef-s from inside the ipsec_pfkey_init.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/key')
| -rw-r--r-- | net/key/af_key.c | 35 |
1 files changed, 27 insertions, 8 deletions
diff --git a/net/key/af_key.c b/net/key/af_key.c index 45c3c27d279a..162fcea3324c 100644 --- a/net/key/af_key.c +++ b/net/key/af_key.c @@ -3782,6 +3782,29 @@ done: return len; } + +static int pfkey_init_proc(void) +{ + if (create_proc_read_entry("pfkey", 0, init_net.proc_net, + pfkey_read_proc, NULL) == NULL) + return -ENOMEM; + else + return 0; +} + +static void pfkey_exit_proc(void) +{ + remove_proc_entry("net/pfkey", NULL); +} +#else +static inline int pfkey_init_proc(void) +{ + return 0; +} + +static inline void pfkey_exit_proc(void) +{ +} #endif static struct xfrm_mgr pfkeyv2_mgr = @@ -3798,7 +3821,7 @@ static struct xfrm_mgr pfkeyv2_mgr = static void __exit ipsec_pfkey_exit(void) { xfrm_unregister_km(&pfkeyv2_mgr); - remove_proc_entry("pfkey", init_net.proc_net); + pfkey_exit_proc(); sock_unregister(PF_KEY); proto_unregister(&key_proto); } @@ -3813,21 +3836,17 @@ static int __init ipsec_pfkey_init(void) err = sock_register(&pfkey_family_ops); if (err != 0) goto out_unregister_key_proto; -#ifdef CONFIG_PROC_FS - err = -ENOMEM; - if (create_proc_read_entry("pfkey", 0, init_net.proc_net, pfkey_read_proc, NULL) == NULL) + err = pfkey_init_proc(); + if (err != 0) goto out_sock_unregister; -#endif err = xfrm_register_km(&pfkeyv2_mgr); if (err != 0) goto out_remove_proc_entry; out: return err; out_remove_proc_entry: -#ifdef CONFIG_PROC_FS - remove_proc_entry("net/pfkey", NULL); + pfkey_exit_proc(); out_sock_unregister: -#endif sock_unregister(PF_KEY); out_unregister_key_proto: proto_unregister(&key_proto); |