aboutsummaryrefslogtreecommitdiffstats
path: root/security/keys/keyring.c
diff options
context:
space:
mode:
authorChihau Chau <chihau@gmail.com>2010-03-08 18:11:34 -0500
committerJames Morris <jmorris@namei.org>2010-03-09 16:46:15 -0500
commit512ea3bc30c0e052a961e1abce8e783f3e28c92a (patch)
tree2e50e5bd7d257ec010d9c9d1af87bd61fccead6c /security/keys/keyring.c
parentc43a7523470dc2d9947fa114a0b54317975d4c04 (diff)
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>
Diffstat (limited to 'security/keys/keyring.c')
-rw-r--r--security/keys/keyring.c7
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 @@
17#include <linux/seq_file.h> 17#include <linux/seq_file.h>
18#include <linux/err.h> 18#include <linux/err.h>
19#include <keys/keyring-type.h> 19#include <keys/keyring-type.h>
20#include <asm/uaccess.h> 20#include <linux/uaccess.h>
21#include "internal.h" 21#include "internal.h"
22 22
23/* 23/*
@@ -304,7 +304,7 @@ key_ref_t keyring_search_aux(key_ref_t keyring_ref,
304 key_check(keyring); 304 key_check(keyring);
305 305
306 /* top keyring must have search permission to begin the search */ 306 /* top keyring must have search permission to begin the search */
307 err = key_task_permission(keyring_ref, cred, KEY_SEARCH); 307 err = key_task_permission(keyring_ref, cred, KEY_SEARCH);
308 if (err < 0) { 308 if (err < 0) {
309 key_ref = ERR_PTR(err); 309 key_ref = ERR_PTR(err);
310 goto error; 310 goto error;
@@ -773,8 +773,7 @@ int __key_link(struct key *keyring, struct key *key)
773 smp_wmb(); 773 smp_wmb();
774 klist->nkeys++; 774 klist->nkeys++;
775 smp_wmb(); 775 smp_wmb();
776 } 776 } else {
777 else {
778 /* grow the key list */ 777 /* grow the key list */
779 max = 4; 778 max = 4;
780 if (klist) 779 if (klist)