[<prev] [next>] [day] [month] [year] [list]
Message-ID: <f5ca57691003091050l8589a5al7ee3dfef78432e35@mail.gmail.com>
Date: Tue, 9 Mar 2010 15:50:17 -0300
From: Chihau Chau <chihau@...il.com>
To: James Kosin <jkosin@...comgrp.com>
Cc: linux-kernel@...r.kernel.org
Subject: Re: [PATCH] Security: key: keyring: fix some code style issues
Now I understand. Sorry for my little confusion.
I am making a new patch.
Thanks!
2010/3/9 James Kosin <jkosin@...comgrp.com>:
> On 3/9/2010 12:39 PM, Chihau Chau wrote:
> Chau,
>
> Below is your original patch set.
>
> From: Chihau Chau <chihau@...il.com>
>
> This fixes some code style issues like to include <linux/uaccess.h> instead
> <asm/uaccess.h> and to remove some innecessary braces.
>
> Signed-off-by: Chihau Chau <chihau@...il.com>
> ---
> security/keys/keyring.c | 11 ++++-------
> 1 files changed, 4 insertions(+), 7 deletions(-)
>
> diff --git a/security/keys/keyring.c b/security/keys/keyring.c
> index e814d21..5a44965 100644
> --- a/security/keys/keyring.c
> +++ b/security/keys/keyring.c
> @@ -17,7 +17,7 @@
> #include <linux/seq_file.h>
> #include <linux/err.h>
> #include <keys/keyring-type.h>
> -#include <asm/uaccess.h>
> +#include <linux/uaccess.h>
> #include "internal.h"
>
> /*
> @@ -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]");
> - }
>
>
> Here is where I said NOT to remove the braces. However you can see the
> style of the if() {} else {} blocks is not the same as below where you point
> to the style of the statements as to the reason for the change.
>
>
> rcu_read_lock();
> klist = rcu_dereference(keyring->payload.subscriptions);
> @@ -775,8 +773,7 @@ int __key_link(struct key *keyring, struct key *key)
> smp_wmb();
> klist->nkeys++;
> smp_wmb();
> - }
> - else {
> + } else {
> /* grow the key list */
> max = 4;
>
>
> See HERE.
>
> if (klist)
> --
> 1.5.6.3
>
> One of these is wrong. Check the coding style document as to which is
> correct.
>
> Sorry to be so critical.
>
> Regards,
> James K.
>
--
Chihau Chau
--
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