On Monday, February 16, 2015 11:33:46 PM Ameen Ali wrote:
> Fixed a coding style issue (unnecessary parentheses , unnecessary braces)
>
> Signed-off-by: Ameen-Ali <ameenali...@gmail.com>
> ---
> kernel/audit.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
Merged into my next-queue branch, I'll push to audit#next once -rc1 is
released.
> diff --git a/kernel/audit.c b/kernel/audit.c
> index 72ab759..0607e12 100644
> --- a/kernel/audit.c
> +++ b/kernel/audit.c
> @@ -663,7 +663,7 @@ static int audit_netlink_ok(struct sk_buff *skb, u16
> msg_type) case AUDIT_MAKE_EQUIV:
> /* Only support auditd and auditctl in initial pid namespace
> * for now. */
> - if ((task_active_pid_ns(current) != &init_pid_ns))
> + if (task_active_pid_ns(current) != &init_pid_ns)
> return -EPERM;
>
> if (!netlink_capable(skb, CAP_AUDIT_CONTROL))
> @@ -1759,7 +1759,7 @@ void audit_log_name(struct audit_context *context,
> struct audit_names *n, } else
> audit_log_format(ab, " name=(null)");
>
> - if (n->ino != (unsigned long)-1) {
> + if (n->ino != (unsigned long)-1)
> audit_log_format(ab, " inode=%lu"
> " dev=%02x:%02x mode=%#ho"
> " ouid=%u ogid=%u rdev=%02x:%02x",
> @@ -1771,7 +1771,6 @@ void audit_log_name(struct audit_context *context,
> struct audit_names *n, from_kgid(&init_user_ns, n->gid),
> MAJOR(n->rdev),
> MINOR(n->rdev));
> - }
> if (n->osid != 0) {
> char *ctx = NULL;
> u32 len;
--
paul moore
www.paul-moore.com
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
