diff options
| author |   Chihau Chau <chihau@gmail.com> | 2010-03-08 20:11:34 -0300 |
|---|---|---|
| committer |   James Morris <jmorris@namei.org> | 2010-03-10 08:46:15 +1100 |
| commit | 512ea3bc30c0e052a961e1abce8e783f3e28c92a (patch) | |
| tree | 2e50e5bd7d257ec010d9c9d1af87bd61fccead6c | |
| parent | Merge branch 'next-queue' into next (diff) | |
| download | linux-dev-512ea3bc30c0e052a961e1abce8e783f3e28c92a.tar.xz linux-dev-512ea3bc30c0e052a961e1abce8e783f3e28c92a.zip | |
Security: key: keyring: fix some code style issues
This fixes to include <linux/uaccess.h> instead <asm/uaccess.h> and some
code style issues like to put a else sentence below close brace '}' and
to replace a tab instead of some space characters.
Signed-off-by: Chihau Chau <chihau@gmail.com>
Acked-by: David Howells <dhowells@redhat.com>
Signed-off-by: James Morris <jmorris@namei.org>
| -rw-r--r-- | security/keys/keyring.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/security/keys/keyring.c b/security/keys/keyring.c index a98fb376f249..fe0763a18c17 100644 --- a/security/keys/keyring.c +++ b/security/keys/keyring.c @@ -17,7 +17,7 @@ #include <linux/seq_file.h> #include <linux/err.h> #include <keys/keyring-type.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "internal.h" /* @@ -304,7 +304,7 @@ key_ref_t keyring_search_aux(key_ref_t keyring_ref, key_check(keyring); /* top keyring must have search permission to begin the search */ - err = key_task_permission(keyring_ref, cred, KEY_SEARCH); + err = key_task_permission(keyring_ref, cred, KEY_SEARCH); if (err < 0) { key_ref = ERR_PTR(err); goto error; @@ -773,8 +773,7 @@ int __key_link(struct key *keyring, struct key *key) smp_wmb(); klist->nkeys++; smp_wmb(); - } - else { + } else { /* grow the key list */ max = 4; if (klist) |