[PATCH] pass dentry to audit_inode()/audit_inode_child()

makes caller simpler *and* allows to scan ancestors

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

4 files changed, 12 insertions, 12 deletions

diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
index 11be8a325e26..6a713b33992f 100644
--- a/fs/debugfs/inode.c
+++ b/fs/debugfs/inode.c
@@ -413,7 +413,7 @@ struct dentry *debugfs_rename(struct dentry *old_dir, struct dentry *old_dentry,
         d_move(old_dentry, dentry);
         fsnotify_move(old_dir->d_inode, new_dir->d_inode, old_name,
                 old_dentry->d_name.name, S_ISDIR(old_dentry->d_inode->i_mode),
-                NULL, old_dentry->d_inode);
+                NULL, old_dentry);
         fsnotify_oldname_free(old_name);
         unlock_rename(new_dir, old_dir);
         dput(dentry);
diff --git a/fs/namei.c b/fs/namei.c
index 1e5c71669164..3b993db26cee 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1174,7 +1174,7 @@ static int fastcall do_path_lookup(int dfd, const char *name,
 out:
         if (unlikely(!retval && !audit_dummy_context() && nd->dentry &&
                                 nd->dentry->d_inode))
-                audit_inode(name, nd->dentry->d_inode);
+                audit_inode(name, nd->dentry);
 out_fail:
         return retval;
 
@@ -1214,7 +1214,7 @@ int vfs_path_lookup(struct dentry *dentry, struct vfsmount *mnt,
         retval = path_walk(name, nd);
         if (unlikely(!retval && !audit_dummy_context() && nd->dentry &&
                                 nd->dentry->d_inode))
-                audit_inode(name, nd->dentry->d_inode);
+                audit_inode(name, nd->dentry);
 
         return retval;
 
@@ -1469,7 +1469,7 @@ static int may_delete(struct inode *dir,struct dentry *victim,int isdir)
                 return -ENOENT;
 
         BUG_ON(victim->d_parent->d_inode != dir);
-        audit_inode_child(victim->d_name.name, victim->d_inode, dir);
+        audit_inode_child(victim->d_name.name, victim, dir);
 
         error = permission(dir,MAY_WRITE | MAY_EXEC, NULL);
         if (error)
@@ -1783,7 +1783,7 @@ do_last:
          * It already exists.
          */
         mutex_unlock(&dir->d_inode->i_mutex);
-        audit_inode(pathname, path.dentry->d_inode);
+        audit_inode(pathname, path.dentry);
 
         error = -EEXIST;
         if (flag & O_EXCL)
@@ -2562,7 +2562,7 @@ int vfs_rename(struct inode *old_dir, struct dentry *old_dentry,
         if (!error) {
                 const char *new_name = old_dentry->d_name.name;
                 fsnotify_move(old_dir, new_dir, old_name, new_name, is_dir,
-                              new_dentry->d_inode, old_dentry->d_inode);
+                              new_dentry->d_inode, old_dentry);
         }
         fsnotify_oldname_free(old_name);
 
diff --git a/fs/open.c b/fs/open.c
index 75385144df7d..3b69c53e1837 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -569,7 +569,7 @@ asmlinkage long sys_fchmod(unsigned int fd, mode_t mode)
         dentry = file->f_path.dentry;
         inode = dentry->d_inode;
 
-        audit_inode(NULL, inode);
+        audit_inode(NULL, dentry);
 
         err = -EROFS;
         if (IS_RDONLY(inode))
@@ -727,7 +727,7 @@ asmlinkage long sys_fchown(unsigned int fd, uid_t user, gid_t group)
                 goto out;
 
         dentry = file->f_path.dentry;
-        audit_inode(NULL, dentry->d_inode);
+        audit_inode(NULL, dentry);
         error = chown_common(dentry, user, group);
         fput(file);
 out:
diff --git a/fs/xattr.c b/fs/xattr.c
index a44fd92caca3..6645b7313b33 100644
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -267,7 +267,7 @@ sys_fsetxattr(int fd, char __user *name, void __user *value,
         if (!f)
                 return error;
         dentry = f->f_path.dentry;
-        audit_inode(NULL, dentry->d_inode);
+        audit_inode(NULL, dentry);
         error = setxattr(dentry, name, value, size, flags);
         fput(f);
         return error;
@@ -349,7 +349,7 @@ sys_fgetxattr(int fd, char __user *name, void __user *value, size_t size)
         f = fget(fd);
         if (!f)
                 return error;
-        audit_inode(NULL, f->f_path.dentry->d_inode);
+        audit_inode(NULL, f->f_path.dentry);
         error = getxattr(f->f_path.dentry, name, value, size);
         fput(f);
         return error;
@@ -422,7 +422,7 @@ sys_flistxattr(int fd, char __user *list, size_t size)
         f = fget(fd);
         if (!f)
                 return error;
-        audit_inode(NULL, f->f_path.dentry->d_inode);
+        audit_inode(NULL, f->f_path.dentry);
         error = listxattr(f->f_path.dentry, list, size);
         fput(f);
         return error;
@@ -485,7 +485,7 @@ sys_fremovexattr(int fd, char __user *name)
         if (!f)
                 return error;
         dentry = f->f_path.dentry;
-        audit_inode(NULL, dentry->d_inode);
+        audit_inode(NULL, dentry);
         error = removexattr(dentry, name);
         fput(f);
         return error;