diff options
| author | David Howells <dhowells@redhat.com> | 2009-09-02 09:14:11 +0100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-09-02 21:29:16 +1000 |
| commit | 7b1b9164598286fe93927ff41eed2a2609fd9056 (patch) | |
| tree | b37a8f4991c5aa6416e269f4edd7317dacc2c67c /security/keys | |
| parent | ad73a717e0fc6949c44e587ca5d63c273a30e6f5 (diff) | |
| download | kernel_goldelico_gta04-7b1b9164598286fe93927ff41eed2a2609fd9056.zip kernel_goldelico_gta04-7b1b9164598286fe93927ff41eed2a2609fd9056.tar.gz kernel_goldelico_gta04-7b1b9164598286fe93927ff41eed2a2609fd9056.tar.bz2 | |
KEYS: Do some whitespace cleanups [try #6]
Do some whitespace cleanups in the key management code.
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/keys')
| -rw-r--r-- | security/keys/proc.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/security/keys/proc.c b/security/keys/proc.c index 624c650..9d01021 100644 --- a/security/keys/proc.c +++ b/security/keys/proc.c @@ -209,11 +209,9 @@ static int proc_keys_show(struct seq_file *m, void *v) /* come up with a suitable timeout value */ if (key->expiry == 0) { memcpy(xbuf, "perm", 5); - } - else if (now.tv_sec >= key->expiry) { + } else if (now.tv_sec >= key->expiry) { memcpy(xbuf, "expd", 5); - } - else { + } else { timo = key->expiry - now.tv_sec; if (timo < 60) @@ -253,9 +251,7 @@ static int proc_keys_show(struct seq_file *m, void *v) seq_putc(m, '\n'); rcu_read_unlock(); - return 0; - } #endif /* CONFIG_KEYS_DEBUG_PROC_KEYS */ @@ -281,6 +277,7 @@ static struct rb_node *key_user_first(struct rb_root *r) struct rb_node *n = rb_first(r); return __key_user_next(n); } + /*****************************************************************************/ /* * implement "/proc/key-users" to provides a list of the key users @@ -288,7 +285,6 @@ static struct rb_node *key_user_first(struct rb_root *r) static int proc_key_users_open(struct inode *inode, struct file *file) { return seq_open(file, &proc_key_users_ops); - } static void *proc_key_users_start(struct seq_file *p, loff_t *_pos) @@ -306,14 +302,12 @@ static void *proc_key_users_start(struct seq_file *p, loff_t *_pos) } return _p; - } static void *proc_key_users_next(struct seq_file *p, void *v, loff_t *_pos) { (*_pos)++; return key_user_next((struct rb_node *) v); - } static void proc_key_users_stop(struct seq_file *p, void *v) |