diff options
author | Christoph Lameter <clameter@sgi.com> | 2006-12-06 23:32:57 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 11:39:23 -0500 |
commit | b86c089b83b8ae2bc814db865057768a9ba787b5 (patch) | |
tree | f5a838ca841c6f655ad25e73a0295c357b904ee4 | |
parent | aa362a83e78d2e9320da588805cf2a0b53356bc3 (diff) |
[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.h | 2 | ||||
-rw-r--r-- | include/linux/slab.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index cac7b1ef9543..a8039c8d8cbb 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
@@ -1481,6 +1481,8 @@ extern char * getname(const char __user *); | |||
1481 | extern void __init vfs_caches_init_early(void); | 1481 | extern void __init vfs_caches_init_early(void); |
1482 | extern void __init vfs_caches_init(unsigned long); | 1482 | extern void __init vfs_caches_init(unsigned long); |
1483 | 1483 | ||
1484 | extern struct kmem_cache *names_cachep; | ||
1485 | |||
1484 | #define __getname() kmem_cache_alloc(names_cachep, SLAB_KERNEL) | 1486 | #define __getname() kmem_cache_alloc(names_cachep, SLAB_KERNEL) |
1485 | #define __putname(name) kmem_cache_free(names_cachep, (void *)(name)) | 1487 | #define __putname(name) kmem_cache_free(names_cachep, (void *)(name)) |
1486 | #ifndef CONFIG_AUDITSYSCALL | 1488 | #ifndef CONFIG_AUDITSYSCALL |
diff --git a/include/linux/slab.h b/include/linux/slab.h index bfc063ee94e8..e67314e4a0a0 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) | |||
308 | 308 | ||
309 | #endif /* CONFIG_SLOB */ | 309 | #endif /* CONFIG_SLOB */ |
310 | 310 | ||
311 | /* System wide caches */ | ||
312 | extern kmem_cache_t *names_cachep; | ||
313 | |||
314 | #endif /* __KERNEL__ */ | 311 | #endif /* __KERNEL__ */ |
315 | 312 | ||
316 | #endif /* _LINUX_SLAB_H */ | 313 | #endif /* _LINUX_SLAB_H */ |