summaryrefslogtreecommitdiffstats
path: root/kernel/auditsc.c
diff options
context:
space:
mode:
authorAl Viro2009-12-25 11:07:33 +0100
committerAl Viro2010-02-08 20:38:36 +0100
commitcccc6bba3f771ef29b33e4f79e70ebc3dba245b0 (patch)
tree0abfed21a68d0ae54217a6f4308046fd30a70186 /kernel/auditsc.c
parentLose the new_name argument of fsnotify_move() (diff)
downloadkernel-qcow2-linux-cccc6bba3f771ef29b33e4f79e70ebc3dba245b0.tar.gz
kernel-qcow2-linux-cccc6bba3f771ef29b33e4f79e70ebc3dba245b0.tar.xz
kernel-qcow2-linux-cccc6bba3f771ef29b33e4f79e70ebc3dba245b0.zip
Lose the first argument of audit_inode_child()
it's always equal to ->d_name.name of the second argument Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'kernel/auditsc.c')
-rw-r--r--kernel/auditsc.c7
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++) {