[PATCH] Move names_cachep to linux/fs.h

The names_cachep is used for getname() and putname().  So lets put it into
fs.h near those two definitions.

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/include/linux/fs.h b/include/linux/fs.h
index cac7b1ef95435d5d1d2f67ae1bb0e1c8d2c51a7c..a8039c8d8cbb810d8606635a22c7abd9b38b0488 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1481,6 +1481,8 @@ extern char * getname(const char __user *);
 extern void __init vfs_caches_init_early(void);
 extern void __init vfs_caches_init(unsigned long);
 
+extern struct kmem_cache *names_cachep;
+
 #define __getname()    kmem_cache_alloc(names_cachep, SLAB_KERNEL)
 #define __putname(name) kmem_cache_free(names_cachep, (void *)(name))
 #ifndef CONFIG_AUDITSYSCALL

diff --git a/include/linux/slab.h b/include/linux/slab.h
index bfc063ee94e80d10a3cd6b9dfc2737fa332e1cba..e67314e4a0a016e6009ac766baf6be0104656fd9 100644 (file)
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -308,9 +308,6 @@ static inline void *kcalloc(size_t n, size_t size, gfp_t flags)
 
 #endif /* CONFIG_SLOB */
 
-/* System wide caches */
-extern kmem_cache_t    *names_cachep;
-
 #endif /* __KERNEL__ */
 
 #endif /* _LINUX_SLAB_H */