summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@sw.ru>2008-04-29 10:01:27 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-29 17:06:16 +0200
commitda91d2ef9fe4fd84cc0a8a729201d38e40ac9f2e (patch)
tree091f2781c5256eac28665a1512038fe07227f9b0
parentkeys: add keyctl function to get a security label (diff)
downloadlinux-da91d2ef9fe4fd84cc0a8a729201d38e40ac9f2e.tar.xz
linux-da91d2ef9fe4fd84cc0a8a729201d38e40ac9f2e.zip
keys: switch to proc_create()
Signed-off-by: Alexey Dobriyan <adobriyan@sw.ru> Cc: David Howells <dhowells@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--security/keys/proc.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/security/keys/proc.c b/security/keys/proc.c
index 694126003ed3..e54679b848cf 100644
--- a/security/keys/proc.c
+++ b/security/keys/proc.c
@@ -70,19 +70,15 @@ static int __init key_proc_init(void)
struct proc_dir_entry *p;
#ifdef CONFIG_KEYS_DEBUG_PROC_KEYS
- p = create_proc_entry("keys", 0, NULL);
+ p = proc_create("keys", 0, NULL, &proc_keys_fops);
if (!p)
panic("Cannot create /proc/keys\n");
-
- p->proc_fops = &proc_keys_fops;
#endif
- p = create_proc_entry("key-users", 0, NULL);
+ p = proc_create("key-users", 0, NULL, &proc_key_users_fops);
if (!p)
panic("Cannot create /proc/key-users\n");
- p->proc_fops = &proc_key_users_fops;
-
return 0;
} /* end key_proc_init() */