From 4642a887666c2413dd21775f73ceb657b8f5351e Mon Sep 17 00:00:00 2001
From: Eric Dumazet <dada1@cosmosbay.com>
Date: Wed, 10 Dec 2008 09:35:45 -0800
Subject: [PATCH] --- yaml --- r: 125005 b: refs/heads/master c:
 b6b3fdead251d432f32f2cfce2a893ab8a658110 h: refs/heads/master i:   125003:
 8d8bdcc9002927520acc30ffc1d65d6fae63c3c1 v: v3

---
 [refs]                        |  2 +-
 trunk/fs/dcache.c             |  6 ------
 trunk/fs/file_table.c         | 10 +++++++++-
 trunk/include/linux/fdtable.h |  2 --
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 3edba78cc7f8..5db24ef95706 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd659fd6275d3426d7967da1f0e3638bbbd2fedb
+refs/heads/master: b6b3fdead251d432f32f2cfce2a893ab8a658110
diff --git a/trunk/fs/dcache.c b/trunk/fs/dcache.c
index bdb3f50248a7..e88c23b85a32 100644
--- a/trunk/fs/dcache.c
+++ b/trunk/fs/dcache.c
@@ -2314,9 +2314,6 @@ static void __init dcache_init(void)
 /* SLAB cache for __getname() consumers */
 struct kmem_cache *names_cachep __read_mostly;
 
-/* SLAB cache for file structures */
-struct kmem_cache *filp_cachep __read_mostly;
-
 EXPORT_SYMBOL(d_genocide);
 
 void __init vfs_caches_init_early(void)
@@ -2338,9 +2335,6 @@ void __init vfs_caches_init(unsigned long mempages)
 	names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
 			SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
 
-	filp_cachep = kmem_cache_create("filp", sizeof(struct file), 0,
-			SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
-
 	dcache_init();
 	inode_init();
 	files_init(mempages);
diff --git a/trunk/fs/file_table.c b/trunk/fs/file_table.c
index 0fbcacc3ea75..bbeeac6efa1a 100644
--- a/trunk/fs/file_table.c
+++ b/trunk/fs/file_table.c
@@ -32,6 +32,9 @@ struct files_stat_struct files_stat = {
 /* public. Not pretty! */
 __cacheline_aligned_in_smp DEFINE_SPINLOCK(files_lock);
 
+/* SLAB cache for file structures */
+static struct kmem_cache *filp_cachep __read_mostly;
+
 static struct percpu_counter nr_files __cacheline_aligned_in_smp;
 
 static inline void file_free_rcu(struct rcu_head *head)
@@ -397,7 +400,12 @@ int fs_may_remount_ro(struct super_block *sb)
 void __init files_init(unsigned long mempages)
 { 
 	int n; 
-	/* One file with associated inode and dcache is very roughly 1K. 
+
+	filp_cachep = kmem_cache_create("filp", sizeof(struct file), 0,
+			SLAB_HWCACHE_ALIGN | SLAB_PANIC, NULL);
+
+	/*
+	 * One file with associated inode and dcache is very roughly 1K.
 	 * Per default don't use more than 10% of our memory for files. 
 	 */ 
 
diff --git a/trunk/include/linux/fdtable.h b/trunk/include/linux/fdtable.h
index 4aab6f12cfab..09d6c5bbdddd 100644
--- a/trunk/include/linux/fdtable.h
+++ b/trunk/include/linux/fdtable.h
@@ -57,8 +57,6 @@ struct files_struct {
 
 #define files_fdtable(files) (rcu_dereference((files)->fdt))
 
-extern struct kmem_cache *filp_cachep;
-
 struct file_operations;
 struct vfsmount;
 struct dentry;