Commit f78570dd authored Oct 10, 2012 by Jeff Layton Committed by Al Viro Oct 12, 2012

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 <eparis@redhat.com>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

parent 79360ddd

fs/namei.c

+2 −6

Original line number	Diff line number	Diff line
		@@ -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)
		if (likely(!retval))
		audit_inode(name, nd->path.dentry);
		}
		}
		return retval;
		}