Commit 7b1b9164598286fe93927ff41eed2a2609fd9056
Committed by
James Morris
James Morris
1 parent
ad73a717e0
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>
Showing 1 changed file with 3 additions and 9 deletions Side-by-side Diff
security/keys/proc.c
| ... | ... | @@ -209,11 +209,9 @@ |
| 209 | 209 | /* come up with a suitable timeout value */ |
| 210 | 210 | if (key->expiry == 0) { |
| 211 | 211 | memcpy(xbuf, "perm", 5); |
| 212 | - } | |
| 213 | - else if (now.tv_sec >= key->expiry) { | |
| 212 | + } else if (now.tv_sec >= key->expiry) { | |
| 214 | 213 | memcpy(xbuf, "expd", 5); |
| 215 | - } | |
| 216 | - else { | |
| 214 | + } else { | |
| 217 | 215 | timo = key->expiry - now.tv_sec; |
| 218 | 216 | |
| 219 | 217 | if (timo < 60) |
| 220 | 218 | |
| ... | ... | @@ -253,9 +251,7 @@ |
| 253 | 251 | seq_putc(m, '\n'); |
| 254 | 252 | |
| 255 | 253 | rcu_read_unlock(); |
| 256 | - | |
| 257 | 254 | return 0; |
| 258 | - | |
| 259 | 255 | } |
| 260 | 256 | |
| 261 | 257 | #endif /* CONFIG_KEYS_DEBUG_PROC_KEYS */ |
| ... | ... | @@ -281,6 +277,7 @@ |
| 281 | 277 | struct rb_node *n = rb_first(r); |
| 282 | 278 | return __key_user_next(n); |
| 283 | 279 | } |
| 280 | + | |
| 284 | 281 | /*****************************************************************************/ |
| 285 | 282 | /* |
| 286 | 283 | * implement "/proc/key-users" to provides a list of the key users |
| ... | ... | @@ -288,7 +285,6 @@ |
| 288 | 285 | static int proc_key_users_open(struct inode *inode, struct file *file) |
| 289 | 286 | { |
| 290 | 287 | return seq_open(file, &proc_key_users_ops); |
| 291 | - | |
| 292 | 288 | } |
| 293 | 289 | |
| 294 | 290 | static void *proc_key_users_start(struct seq_file *p, loff_t *_pos) |
| 295 | 291 | |
| ... | ... | @@ -306,14 +302,12 @@ |
| 306 | 302 | } |
| 307 | 303 | |
| 308 | 304 | return _p; |
| 309 | - | |
| 310 | 305 | } |
| 311 | 306 | |
| 312 | 307 | static void *proc_key_users_next(struct seq_file *p, void *v, loff_t *_pos) |
| 313 | 308 | { |
| 314 | 309 | (*_pos)++; |
| 315 | 310 | return key_user_next((struct rb_node *) v); |
| 316 | - | |
| 317 | 311 | } |
| 318 | 312 | |
| 319 | 313 | static void proc_key_users_stop(struct seq_file *p, void *v) |