From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Layton Subject: [PATCH v7 01/49] audit: remove unnecessary NULL ptr checks from do_path_lookup Date: Mon, 1 Oct 2012 20:16:10 -0400 Message-ID: <1349137018-21948-2-git-send-email-jlayton@redhat.com> References: <1349137018-21948-1-git-send-email-jlayton@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mx1.redhat.com (ext-mx13.extmail.prod.ext.phx2.redhat.com [10.5.110.18]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q920H7Ng020134 for ; Mon, 1 Oct 2012 20:17:07 -0400 Received: from mail-yx0-f174.google.com (mail-yx0-f174.google.com [209.85.213.174]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q920H6t5018698 for ; Mon, 1 Oct 2012 20:17:07 -0400 Received: by yenm12 with SMTP id m12so1534914yen.33 for ; Mon, 01 Oct 2012 17:17:06 -0700 (PDT) In-Reply-To: <1349137018-21948-1-git-send-email-jlayton@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-audit-bounces@redhat.com Errors-To: linux-audit-bounces@redhat.com To: viro@ZenIV.linux.org.uk Cc: linux-fsdevel@vger.kernel.org, linux-audit@redhat.com, linux-kernel@vger.kernel.org List-Id: linux-audit@redhat.com As best I can tell, whenever retval == 0, nd->path.dentry and nd->inode are also non-NULL. Eliminate those checks and the superfluous audit_context check. Signed-off-by: Eric Paris Signed-off-by: Jeff Layton --- fs/namei.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index dd1ed1b..e3661762 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1976,12 +1976,8 @@ static int do_path_lookup(int dfd, const char *name, if (unlikely(retval == -ESTALE)) retval = path_lookupat(dfd, name, flags | LOOKUP_REVAL, nd); - if (likely(!retval)) { - if (unlikely(!audit_dummy_context())) { - if (nd->path.dentry && nd->inode) - audit_inode(name, nd->path.dentry); - } - } + if (likely(!retval)) + audit_inode(name, nd->path.dentry); return retval; } -- 1.7.11.4