Skip to contentSkip to conversation

Security: key: keyring: fix code style issues

PATCH James Kosin 1 participant 1 message Mar 9, 2010 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

James Kosin

author Reviewed-by
#1 lore raw
Quoted 7 lines · Chihau Chau

From: Chihau Chau <[email protected]>

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.

Quoted 46 lines
---
 security/keys/keyring.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)
security/keys/keyring.c +4 -6
index e814d21..d8b5d5e 100644
@@ -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"
 
 /*
@@ -172,8 +172,7 @@ static void keyring_describe(const struct key *keyring, struct seq_file *m)
 
 	if (keyring->description) {
 		seq_puts(m, keyring->description);
-	}
-	else {
+	} else {
 		seq_puts(m, "[anon]");
 	}
 
@@ -306,7 +305,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;
@@ -775,8 +774,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)