Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752611AbbBQPod (ORCPT ); Tue, 17 Feb 2015 10:44:33 -0500 Received: from mail-qg0-f51.google.com ([209.85.192.51]:34978 "EHLO mail-qg0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752432AbbBQPoc (ORCPT ); Tue, 17 Feb 2015 10:44:32 -0500 From: Paul Moore To: Ameen Ali Cc: linux-audit@redhat.com, linux-kernel@vger.kernel.org Subject: Re: [PATCH] audit.c : Code clean up Date: Tue, 17 Feb 2015 10:44:29 -0500 Message-ID: <18997352.r04PNRbiro@sifl> User-Agent: KMail/4.14.3 (Linux/3.16.7-gentoo; KDE/4.14.3; x86_64; ; ) In-Reply-To: <1424122426-10991-1-git-send-email-ameenali023@gmail.com> References: <1424122426-10991-1-git-send-email-ameenali023@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1740 Lines: 51 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 > --- > 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 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/