diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-13 12:47:30 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-13 12:47:30 -0400 |
| commit | 5d54e69c68c05b162a56f9914cae72afd7e6f40a (patch) | |
| tree | c5933858c4861bc3e358559f64ef459a1f56ab75 /fs | |
| parent | 63f3d1df1ad276a30b75339dd682a6e1f9d0c181 (diff) | |
| parent | b6ddc518520887a62728b0414efbf802a9dfdd55 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/dwmw2/audit-2.6
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/namei.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/namei.c b/fs/namei.c index 21d85f1ac839..043d587216b5 100644 --- a/fs/namei.c +++ b/fs/namei.c | |||
| @@ -1048,7 +1048,7 @@ int fastcall path_lookup(const char *name, unsigned int flags, struct nameidata | |||
| 1048 | out: | 1048 | out: |
| 1049 | if (unlikely(current->audit_context | 1049 | if (unlikely(current->audit_context |
| 1050 | && nd && nd->dentry && nd->dentry->d_inode)) | 1050 | && nd && nd->dentry && nd->dentry->d_inode)) |
| 1051 | audit_inode(name, nd->dentry->d_inode); | 1051 | audit_inode(name, nd->dentry->d_inode, flags); |
| 1052 | return retval; | 1052 | return retval; |
| 1053 | } | 1053 | } |
| 1054 | 1054 | ||