Re: [PATCH] Security: key: keyring: fix some code style issues

[Chihau Chau <chihau@gmail.com>]

Hi James

2010/3/9 James Kosin <jkosin@intcomgrp.com>:
> Chau,
>
> I was talking about removing the braces.  The code you pointed to still had
> the style issue of this:
>     }
>     else {
>
> Where you changed the one below to be:
>     } else {
>
This is done in the last patch

> I'm okay with making a change like this.  Only don't remove the {} braces.
Yes in the last patch I don't have remove the braces {}

Now, It's everything OK? I will appreciate your councils.

Regards.

>
> James
>
> On 3/9/2010 12:01 PM, Chihau Chau wrote:
>
> You said me that it may introduce a serious BUG later so I have undone
> this change.
>
> Regards.
>
> 2010/3/9 James Kosin <jkosin@intcomgrp.com>:
>
>
> On 3/8/2010 6:20 PM, Chihau Chau wrote:
>
>
> From: Chihau Chau <chihau@gmail.com>
>
> This fixes to include <linux/uaccess.h> instead <asm/uaccess.h> and some
> code style issues like to put a else sentence below close brace '}' and
> to replace a tab instead of some space characters.
>
> Signed-off-by: Chihau Chau <chihau@gmail.com>
> ---
>  security/keys/keyring.c |    7 +++----
>  1 files changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/security/keys/keyring.c b/security/keys/keyring.c
> index e814d21..840be66 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"
>
>  /*
> @@ -306,7 +306,7 @@ key_ref_t keyring_search_aux(key_ref_t keyring_ref,
>       key_check(keyring);
>
>       /* top keyring must have search permission to begin the search */
> -        err = key_task_permission(keyring_ref, cred, KEY_SEARCH);
> +     err = key_task_permission(keyring_ref, cred, KEY_SEARCH);
>       if (err < 0) {
>               key_ref = ERR_PTR(err);
>               goto error;
> @@ -775,8 +775,7 @@ int __key_link(struct key *keyring, struct key *key)
>               smp_wmb();
>               klist->nkeys++;
>               smp_wmb();
> -     }
> -     else {
> +     } else {
>               /* grow the key list */
>               max = 4;
>               if (klist)
>
>
> Chau,
>
> What happened to the other part of the patch to fix the "} else {" above
> where you had tried to remove the {} ?
>
> James
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
>
>
>
>
>



-- 
Chihau Chau