diff options
author | James Morris <jmorris@namei.org> | 2010-03-09 12:46:47 +1100 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2010-03-09 12:46:47 +1100 |
commit | c43a7523470dc2d9947fa114a0b54317975d4c04 (patch) | |
tree | 30a72ed1e9079f19b814263197761820f57c39ce /security/keys | |
parent | eaa5eec739637f32f8733d528ff0b94fd62b1214 (diff) | |
parent | 634a539e16bd7a1ba31c3f832baa725565cc9f96 (diff) | |
download | kernel_samsung_smdk4412-c43a7523470dc2d9947fa114a0b54317975d4c04.zip kernel_samsung_smdk4412-c43a7523470dc2d9947fa114a0b54317975d4c04.tar.gz kernel_samsung_smdk4412-c43a7523470dc2d9947fa114a0b54317975d4c04.tar.bz2 |
Merge branch 'next-queue' into next
Diffstat (limited to 'security/keys')
-rw-r--r-- | security/keys/keyring.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/security/keys/keyring.c b/security/keys/keyring.c index e814d21..a98fb37 100644 --- a/security/keys/keyring.c +++ b/security/keys/keyring.c @@ -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); |