Merge branch 'audit.b43' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current

* 'audit.b43' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current:
  [PATCH] audit: watching subtrees
  [PATCH] new helper - inotify_evict_watch()
  [PATCH] new helper - inotify_clone_watch()
  [PATCH] new helpers - collect_mounts() and release_collected_mounts()
  [PATCH] pass dentry to audit_inode()/audit_inode_child()

1 files changed, 4 insertions, 4 deletions

diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index c0b26dc4617b..bfa274ba9ed4 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -676,7 +676,7 @@ asmlinkage long sys_mq_open(const char __user *u_name, int oflag, mode_t mode,
 
         if (oflag & O_CREAT) {
                 if (dentry->d_inode) {  /* entry already exists */
-                        audit_inode(name, dentry->d_inode);
+                        audit_inode(name, dentry);
                         error = -EEXIST;
                         if (oflag & O_EXCL)
                                 goto out;
@@ -689,7 +689,7 @@ asmlinkage long sys_mq_open(const char __user *u_name, int oflag, mode_t mode,
                 error = -ENOENT;
                 if (!dentry->d_inode)
                         goto out;
-                audit_inode(name, dentry->d_inode);
+                audit_inode(name, dentry);
                 filp = do_open(dentry, oflag);
         }
 
@@ -837,7 +837,7 @@ asmlinkage long sys_mq_timedsend(mqd_t mqdes, const char __user *u_msg_ptr,
         if (unlikely(filp->f_op != &mqueue_file_operations))
                 goto out_fput;
         info = MQUEUE_I(inode);
-        audit_inode(NULL, inode);
+        audit_inode(NULL, filp->f_path.dentry);
 
         if (unlikely(!(filp->f_mode & FMODE_WRITE)))
                 goto out_fput;
@@ -921,7 +921,7 @@ asmlinkage ssize_t sys_mq_timedreceive(mqd_t mqdes, char __user *u_msg_ptr,
         if (unlikely(filp->f_op != &mqueue_file_operations))
                 goto out_fput;
         info = MQUEUE_I(inode);
-        audit_inode(NULL, inode);
+        audit_inode(NULL, filp->f_path.dentry);
 
         if (unlikely(!(filp->f_mode & FMODE_READ)))
                 goto out_fput;