audit: remove unnecessary NULL ptr checks from do_path_lookup
Jeff Layton [Wed, 10 Oct 2012 19:25:20 +0000 (15:25 -0400)]
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 <eparis@redhat.com>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

fs/namei.c

index c1f18e4..f04ce11 100644 (file)
@@ -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;
 }