Prev: usb-serial: Fix usb serial console open/close regression
Next: [PATCH v2 2/7] RapidIO: Add switch locking during discovery
From: Chihau Chau on 8 Mar 2010 13:20 From: Chihau Chau <chihau(a)gmail.com> This fixes some code style issues like to include <linux/uaccess.h> instead <asm/uaccess.h> and to remove some innecessary braces. Signed-off-by: Chihau Chau <chihau(a)gmail.com> --- security/keys/keyring.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/security/keys/keyring.c b/security/keys/keyring.c index e814d21..5a44965 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" /* @@ -170,12 +170,10 @@ static void keyring_describe(const struct key *keyring, struct seq_file *m) { struct keyring_list *klist; - if (keyring->description) { + if (keyring->description) seq_puts(m, keyring->description); - } - else { + else seq_puts(m, "[anon]"); - } rcu_read_lock(); klist = rcu_dereference(keyring->payload.subscriptions); @@ -775,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) -- 1.5.6.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |