diff options
author | David Woodhouse <dwmw2@infradead.org> | 2007-07-23 05:20:10 -0400 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2007-07-23 05:20:10 -0400 |
commit | 39fe5434cb9de5da40510028b17b96bc4eb312b3 (patch) | |
tree | 7a02a317b9ad57da51ca99887c119e779ccf3f13 /fs/bfs | |
parent | 0fc72b81d3111d114ab378935b1cf07680ca1289 (diff) | |
parent | f695baf2df9e0413d3521661070103711545207a (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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 58c7bd9f5301..f346eb14e86f 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; |