Pull ec into release branch

[linux-2.6] / fs / dcookies.c

diff --git a/fs/dcookies.c b/fs/dcookies.c
index ef758cfa5565b8f980d773df684b3b28ac60fc44..c1208f53bd74596c74423f085886c859bf51cf3e 100644 (file)
--- a/fs/dcookies.c
+++ b/fs/dcookies.c
@@ -12,7 +12,6 @@
  * to the pair and can be looked up from userspace.
  */
 
-#include <linux/config.h>
 #include <linux/syscalls.h>
 #include <linux/module.h>
 #include <linux/slab.h>
@@ -38,9 +37,9 @@ struct dcookie_struct {
 
 static LIST_HEAD(dcookie_users);
 static DEFINE_MUTEX(dcookie_mutex);
-static kmem_cache_t * dcookie_cache;
-static struct list_head * dcookie_hashtable;
-static size_t hash_size;
+static struct kmem_cache *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)
 {
@@ -206,7 +205,7 @@ static int dcookie_init(void)
 
        dcookie_cache = kmem_cache_create("dcookie_cache",
                sizeof(struct dcookie_struct),
-               0, 0, NULL, NULL);
+               0, 0, NULL);
 
        if (!dcookie_cache)
                goto out;