diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 21:38:13 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 21:38:13 -0400 |
commit | 9a79b2274186fade17134929d4f85b70d59a3840 (patch) | |
tree | d74e9ecc83ef617166445501b49087726595fb63 /fs/bfs | |
parent | 75473c1d3930896bbabcc99bb58fafd53ef42473 (diff) | |
parent | 20c2df83d25c6a95affe6157a4c9cac4cf5ffaac (diff) |
Merge branch 'kmem_death' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'kmem_death' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
mm: Remove slab destructors from kmem_cache_create().
Diffstat (limited to 'fs/bfs')
-rw-r--r-- | fs/bfs/inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/bfs/inode.c b/fs/bfs/inode.c index 58c7bd9f53..f346eb14e8 100644 --- a/fs/bfs/inode.c +++ b/fs/bfs/inode.c | |||
@@ -250,14 +250,14 @@ static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flag | |||
250 | 250 | ||
251 | inode_init_once(&bi->vfs_inode); | 251 | inode_init_once(&bi->vfs_inode); |
252 | } | 252 | } |
253 | 253 | ||
254 | static int init_inodecache(void) | 254 | static int init_inodecache(void) |
255 | { | 255 | { |
256 | bfs_inode_cachep = kmem_cache_create("bfs_inode_cache", | 256 | bfs_inode_cachep = kmem_cache_create("bfs_inode_cache", |
257 | sizeof(struct bfs_inode_info), | 257 | sizeof(struct bfs_inode_info), |
258 | 0, (SLAB_RECLAIM_ACCOUNT| | 258 | 0, (SLAB_RECLAIM_ACCOUNT| |
259 | SLAB_MEM_SPREAD), | 259 | SLAB_MEM_SPREAD), |
260 | init_once, NULL); | 260 | init_once); |
261 | if (bfs_inode_cachep == NULL) | 261 | if (bfs_inode_cachep == NULL) |
262 | return -ENOMEM; | 262 | return -ENOMEM; |
263 | return 0; | 263 | return 0; |