From f78570dd6ad9563fffd24cc5e1808e1a1242f16e Mon Sep 17 00:00:00 2001 From: Jeff Layton Date: Wed, 10 Oct 2012 15:25:20 -0400 Subject: audit: remove unnecessary NULL ptr checks from do_path_lookup 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 Signed-off-by: Al Viro --- fs/namei.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'fs') diff --git a/fs/namei.c b/fs/namei.c index c1f18e4f034c..f04ce1142297 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1972,12 +1972,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; } -- cgit v1.2.3