diff options
| author | Jeff Layton <jlayton@redhat.com> | 2012-10-10 15:25:20 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-10-12 00:31:59 -0400 |
| commit | f78570dd6ad9563fffd24cc5e1808e1a1242f16e (patch) | |
| tree | f7f7101c35a019e860233cbb0db2d2ef40bc23e0 /fs/namei.c | |
| parent | 79360ddd73dfe9a26f49ef4e27b8c26612929b0e (diff) | |
| download | linux-f78570dd6ad9563fffd24cc5e1808e1a1242f16e.tar.gz linux-f78570dd6ad9563fffd24cc5e1808e1a1242f16e.tar.xz | |
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>
Diffstat (limited to 'fs/namei.c')
| -rw-r--r-- | fs/namei.c | 8 |
1 files changed, 2 insertions, 6 deletions
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; } |