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/hfsplus/super.c | |
| 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/hfsplus/super.c')
| -rw-r--r-- | fs/hfsplus/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c index 6d87a2a9534d..7b0f2e5a44e2 100644 --- a/fs/hfsplus/super.c +++ b/fs/hfsplus/super.c | |||
| @@ -479,7 +479,7 @@ static int __init init_hfsplus_fs(void) | |||
| 479 | 479 | ||
| 480 | hfsplus_inode_cachep = kmem_cache_create("hfsplus_icache", | 480 | hfsplus_inode_cachep = kmem_cache_create("hfsplus_icache", |
| 481 | HFSPLUS_INODE_SIZE, 0, SLAB_HWCACHE_ALIGN, | 481 | HFSPLUS_INODE_SIZE, 0, SLAB_HWCACHE_ALIGN, |
| 482 | hfsplus_init_once, NULL); | 482 | hfsplus_init_once); |
| 483 | if (!hfsplus_inode_cachep) | 483 | if (!hfsplus_inode_cachep) |
| 484 | return -ENOMEM; | 484 | return -ENOMEM; |
| 485 | err = register_filesystem(&hfsplus_fs_type); | 485 | err = register_filesystem(&hfsplus_fs_type); |