[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <alpine.LRH.2.00.1003050949350.8114@tundra.namei.org>
Date: Fri, 5 Mar 2010 09:49:53 +1100 (EST)
From: James Morris <jmorris@...ei.org>
To: wzt.wzt@...il.com
cc: linux-kernel@...r.kernel.org,
linux-security-module@...r.kernel.org, dhowells@...hat.com
Subject: Re: [PATCH 1/2] Security: Fix some coding styles in
security/keys/keyring.c
On Thu, 4 Mar 2010, wzt.wzt@...il.com wrote:
> Fix some coding styles in security/keys/keyring.c
>
> Signed-off-by: Zhitong Wang <zhitong.wangzt@...baba-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@...ei.org>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists