diff options
| author | David S. Miller <davem@davemloft.net> | 2008-02-26 22:20:44 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-26 22:23:31 -0800 |
| commit | d9595a7b9c777d45a74774f1428c263a0a47f4c0 (patch) | |
| tree | 1151c7d17fe6b95f99134d8689876cdae8f491e4 /net/key | |
| parent | 78374676efae525094aee45c0aab4bcab95ea9d1 (diff) | |
| download | linux-d9595a7b9c777d45a74774f1428c263a0a47f4c0.tar.gz linux-d9595a7b9c777d45a74774f1428c263a0a47f4c0.tar.bz2 linux-d9595a7b9c777d45a74774f1428c263a0a47f4c0.zip | |
[AF_KEY]: Fix oops by converting to proc_net_*().
To make sure the procfs visibility occurs after the ->proc_fs ops are
setup, use proc_net_fops_create() and proc_net_remove().
This also fixes an OOPS after module unload in that the name string
for remove was wrong, so it wouldn't actually be removed. That bug
was introduced by commit 61145aa1a12401ac71bcc450a58c773dd6e2bfb9
("[KEY]: Clean up proc files creation a bit.")
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/key')
| -rw-r--r-- | net/key/af_key.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/key/af_key.c b/net/key/af_key.c index 1c853927810a..8b5f486ac80f 100644 --- a/net/key/af_key.c +++ b/net/key/af_key.c @@ -3807,17 +3807,16 @@ static int pfkey_init_proc(void) { struct proc_dir_entry *e; - e = create_proc_entry("pfkey", 0, init_net.proc_net); + e = proc_net_fops_create(&init_net, "pfkey", 0, &pfkey_proc_ops); if (e == NULL) return -ENOMEM; - e->proc_fops = &pfkey_proc_ops; return 0; } static void pfkey_exit_proc(void) { - remove_proc_entry("net/pfkey", NULL); + proc_net_remove(&init_net, "pfkey"); } #else static inline int pfkey_init_proc(void) |