diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2010-03-03 17:12:40 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-03-03 17:12:40 -0500 |
| commit | 9643f5d94aadd47a5fa9754fb60f2c957de05903 (patch) | |
| tree | c299736cbcdd7f971c1c308433e248198060fefa /kernel | |
| parent | 2bd3a997befc226ab4b504f05c5cbba305f3e0e6 (diff) | |
| parent | c44dcc56d2b5c79ba3063d20f76e5347e2e418f6 (diff) | |
Merge branch 'for-fsnotify' into for-linus
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/auditsc.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/kernel/auditsc.c b/kernel/auditsc.c index fc0f928167e7..f3a461c0970a 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c @@ -1988,7 +1988,6 @@ void __audit_inode(const char *name, const struct dentry *dentry) /** * audit_inode_child - collect inode info for created/removed objects - * @dname: inode's dentry name * @dentry: dentry being audited * @parent: inode of dentry parent * @@ -2000,13 +1999,14 @@ void __audit_inode(const char *name, const struct dentry *dentry) * must be hooked prior, in order to capture the target inode during * unsuccessful attempts. */ -void __audit_inode_child(const char *dname, const struct dentry *dentry, +void __audit_inode_child(const struct dentry *dentry, const struct inode *parent) { int idx; struct audit_context *context = current->audit_context; const char *found_parent = NULL, *found_child = NULL; const struct inode *inode = dentry->d_inode; + const char *dname = dentry->d_name.name; int dirlen = 0; if (!context->in_syscall) @@ -2014,9 +2014,6 @@ void __audit_inode_child(const char *dname, const struct dentry *dentry, if (inode) handle_one(inode); - /* determine matching parent */ - if (!dname) - goto add_names; /* parent is more likely, look for it first */ for (idx = 0; idx < context->name_count; idx++) { |