* [PATCH 1/2] Security: Fix some coding styles in security/keys/keyring.c
@ 2010-03-04 13:26 wzt.wzt
2010-03-04 22:49 ` James Morris
2010-03-08 14:10 ` David Howells
0 siblings, 2 replies; 3+ messages in thread
From: wzt.wzt @ 2010-03-04 13:26 UTC (permalink / raw)
To: linux-kernel; +Cc: linux-security-module, jmorris, dhowells
Fix some coding styles in security/keys/keyring.c
Signed-off-by: Zhitong Wang <zhitong.wangzt@alibaba-inc.com>
---
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 8ec0274..d77a7ef 100644
--- a/security/keys/keyring.c
+++ b/security/keys/keyring.c
@@ -168,12 +168,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);
--
1.6.5.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] Security: Fix some coding styles in security/keys/keyring.c
2010-03-04 13:26 [PATCH 1/2] Security: Fix some coding styles in security/keys/keyring.c wzt.wzt
@ 2010-03-04 22:49 ` James Morris
2010-03-08 14:10 ` David Howells
1 sibling, 0 replies; 3+ messages in thread
From: James Morris @ 2010-03-04 22:49 UTC (permalink / raw)
To: wzt.wzt; +Cc: linux-kernel, linux-security-module, dhowells
On Thu, 4 Mar 2010, wzt.wzt@gmail.com wrote:
> Fix some coding styles in security/keys/keyring.c
>
> Signed-off-by: Zhitong Wang <zhitong.wangzt@alibaba-inc.com>
Applied to
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6#next-queue
Note, there seems to be no patch 2/2.
>
> ---
> 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 8ec0274..d77a7ef 100644
> --- a/security/keys/keyring.c
> +++ b/security/keys/keyring.c
> @@ -168,12 +168,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);
> --
> 1.6.5.3
>
--
James Morris
<jmorris@namei.org>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] Security: Fix some coding styles in security/keys/keyring.c
2010-03-04 13:26 [PATCH 1/2] Security: Fix some coding styles in security/keys/keyring.c wzt.wzt
2010-03-04 22:49 ` James Morris
@ 2010-03-08 14:10 ` David Howells
1 sibling, 0 replies; 3+ messages in thread
From: David Howells @ 2010-03-08 14:10 UTC (permalink / raw)
To: wzt.wzt; +Cc: dhowells, linux-kernel, linux-security-module, jmorris
wzt.wzt@gmail.com wrote:
> Fix some coding styles in security/keys/keyring.c
>
> Signed-off-by: Zhitong Wang <zhitong.wangzt@alibaba-inc.com>
Acked-by: David Howells <dhowells@redhat.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-03-08 14:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-04 13:26 [PATCH 1/2] Security: Fix some coding styles in security/keys/keyring.c wzt.wzt
2010-03-04 22:49 ` James Morris
2010-03-08 14:10 ` David Howells
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox