summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Lameter <clameter@sgi.com>2006-12-06 20:32:57 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-07 08:39:23 -0800
commitb86c089b83b8ae2bc814db865057768a9ba787b5 (patch)
treef5a838ca841c6f655ad25e73a0295c357b904ee4
parentaa362a83e78d2e9320da588805cf2a0b53356bc3 (diff)
downloadop-kernel-dev-b86c089b83b8ae2bc814db865057768a9ba787b5.zip
op-kernel-dev-b86c089b83b8ae2bc814db865057768a9ba787b5.tar.gz
[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>
-rw-r--r--include/linux/fs.h2
-rw-r--r--include/linux/slab.h3
2 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h
index cac7b1e..a8039c8 100644
--- 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 bfc063e..e67314e 100644
--- 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 */
OpenPOWER on IntegriCloud