1 files changed, 5 insertions, 4 deletions

diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index c8943b53d8e6..4e776f9c80e7 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -11,6 +11,7 @@
  * This file is released under the GPL.
  */
 
+#include <linux/capability.h>
 #include <linux/init.h>
 #include <linux/pagemap.h>
 #include <linux/file.h>
@@ -660,7 +661,7 @@ asmlinkage long sys_mq_open(const char __user *u_name, int oflag, mode_t mode,
         if (fd < 0)
                 goto out_putname;
 
-        down(&mqueue_mnt->mnt_root->d_inode->i_sem);
+        mutex_lock(&mqueue_mnt->mnt_root->d_inode->i_mutex);
         dentry = lookup_one_len(name, mqueue_mnt->mnt_root, strlen(name));
         if (IS_ERR(dentry)) {
                 error = PTR_ERR(dentry);
@@ -697,7 +698,7 @@ out_putfd:
 out_err:
         fd = error;
 out_upsem:
-        up(&mqueue_mnt->mnt_root->d_inode->i_sem);
+        mutex_unlock(&mqueue_mnt->mnt_root->d_inode->i_mutex);
 out_putname:
         putname(name);
         return fd;
@@ -714,7 +715,7 @@ asmlinkage long sys_mq_unlink(const char __user *u_name)
         if (IS_ERR(name))
                 return PTR_ERR(name);
 
-        down(&mqueue_mnt->mnt_root->d_inode->i_sem);
+        mutex_lock(&mqueue_mnt->mnt_root->d_inode->i_mutex);
         dentry = lookup_one_len(name, mqueue_mnt->mnt_root, strlen(name));
         if (IS_ERR(dentry)) {
                 err = PTR_ERR(dentry);
@@ -735,7 +736,7 @@ out_err:
         dput(dentry);
 
 out_unlock:
-        up(&mqueue_mnt->mnt_root->d_inode->i_sem);
+        mutex_unlock(&mqueue_mnt->mnt_root->d_inode->i_mutex);
         putname(name);
         if (inode)
                 iput(inode);