1 files changed, 10 insertions, 9 deletions

diff --git a/fs/dcookies.c b/fs/dcookies.c
index f8274a8f83bd..ef758cfa5565 100644
--- a/fs/dcookies.c
+++ b/fs/dcookies.c
@@ -23,6 +23,7 @@
 #include <linux/mm.h>
 #include <linux/errno.h>
 #include <linux/dcookies.h>
+#include <linux/mutex.h>
 #include <asm/uaccess.h>
 
 /* The dcookies are allocated from a kmem_cache and
@@ -36,7 +37,7 @@ struct dcookie_struct {
 };
 
 static LIST_HEAD(dcookie_users);
-static DECLARE_MUTEX(dcookie_sem);
+static DEFINE_MUTEX(dcookie_mutex);
 static kmem_cache_t * dcookie_cache;
 static struct list_head * dcookie_hashtable;
 static size_t hash_size;
@@ -114,7 +115,7 @@ int get_dcookie(struct dentry * dentry, struct vfsmount * vfsmnt,
         int err = 0;
         struct dcookie_struct * dcs;
 
-        down(&dcookie_sem);
+        mutex_lock(&dcookie_mutex);
 
         if (!is_live()) {
                 err = -EINVAL;
@@ -134,7 +135,7 @@ int get_dcookie(struct dentry * dentry, struct vfsmount * vfsmnt,
         *cookie = dcookie_value(dcs);
 
 out:
-        up(&dcookie_sem);
+        mutex_unlock(&dcookie_mutex);
         return err;
 }
 
@@ -157,7 +158,7 @@ asmlinkage long sys_lookup_dcookie(u64 cookie64, char __user * buf, size_t len)
         if (!capable(CAP_SYS_ADMIN))
                 return -EPERM;
 
-        down(&dcookie_sem);
+        mutex_lock(&dcookie_mutex);
 
         if (!is_live()) {
                 err = -EINVAL;
@@ -192,7 +193,7 @@ asmlinkage long sys_lookup_dcookie(u64 cookie64, char __user * buf, size_t len)
 out_free:
         kfree(kbuf);
 out:
-        up(&dcookie_sem);
+        mutex_unlock(&dcookie_mutex);
         return err;
 }
 
@@ -290,7 +291,7 @@ struct dcookie_user * dcookie_register(void)
 {
         struct dcookie_user * user;
 
-        down(&dcookie_sem);
+        mutex_lock(&dcookie_mutex);
 
         user = kmalloc(sizeof(struct dcookie_user), GFP_KERNEL);
         if (!user)
@@ -302,7 +303,7 @@ struct dcookie_user * dcookie_register(void)
         list_add(&user->next, &dcookie_users);
 
 out:
-        up(&dcookie_sem);
+        mutex_unlock(&dcookie_mutex);
         return user;
 out_free:
         kfree(user);
@@ -313,7 +314,7 @@ out_free:
 
 void dcookie_unregister(struct dcookie_user * user)
 {
-        down(&dcookie_sem);
+        mutex_lock(&dcookie_mutex);
 
         list_del(&user->next);
         kfree(user);
@@ -321,7 +322,7 @@ void dcookie_unregister(struct dcookie_user * user)
         if (!is_live())
                 dcookie_exit();
 
-        up(&dcookie_sem);
+        mutex_unlock(&dcookie_mutex);
 }
 
 EXPORT_SYMBOL_GPL(dcookie_register);