Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / fs / dcookies.c

diff --git a/fs/dcookies.c b/fs/dcookies.c
index 581aac9..8749339 100644 (file)
--- a/fs/dcookies.c
+++ b/fs/dcookies.c
@@ -18,10 +18,12 @@
 #include <linux/slab.h>
 #include <linux/list.h>
 #include <linux/mount.h>
+#include <linux/capability.h>
 #include <linux/dcache.h>
 #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
@@ -35,10 +37,10 @@ struct dcookie_struct {
 };
 
 static LIST_HEAD(dcookie_users);
-static DECLARE_MUTEX(dcookie_sem);
-static kmem_cache_t * dcookie_cache;
-static struct list_head * dcookie_hashtable;
-static size_t hash_size;
+static DEFINE_MUTEX(dcookie_mutex);
+static kmem_cache_t *dcookie_cache __read_mostly;
+static struct list_head *dcookie_hashtable __read_mostly;
+static size_t hash_size __read_mostly;
 
 static inline int is_live(void)
 {
@@ -94,12 +96,10 @@ static struct dcookie_struct * alloc_dcookie(struct dentry * dentry,
        if (!dcs)
                return NULL;
 
-       atomic_inc(&dentry->d_count);
-       atomic_inc(&vfsmnt->mnt_count);
        dentry->d_cookie = dcs;
 
-       dcs->dentry = dentry;
-       dcs->vfsmnt = vfsmnt;
+       dcs->dentry = dget(dentry);
+       dcs->vfsmnt = mntget(vfsmnt);
        hash_dcookie(dcs);
 
        return dcs;
@@ -115,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;
@@ -135,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;
 }
 
@@ -158,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;
@@ -193,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;
 }
 
@@ -291,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)
@@ -303,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);
@@ -314,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);
@@ -322,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);