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/hfs | |
| 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/hfs')
| -rw-r--r-- | fs/hfs/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/hfs/super.c b/fs/hfs/super.c index 92cf8751e4..6c5f92dfb5 100644 --- a/fs/hfs/super.c +++ b/fs/hfs/super.c | |||
| @@ -443,7 +443,7 @@ static int __init init_hfs_fs(void) | |||
| 443 | 443 | ||
| 444 | hfs_inode_cachep = kmem_cache_create("hfs_inode_cache", | 444 | hfs_inode_cachep = kmem_cache_create("hfs_inode_cache", |
| 445 | sizeof(struct hfs_inode_info), 0, SLAB_HWCACHE_ALIGN, | 445 | sizeof(struct hfs_inode_info), 0, SLAB_HWCACHE_ALIGN, |
| 446 | hfs_init_once, NULL); | 446 | hfs_init_once); |
| 447 | if (!hfs_inode_cachep) | 447 | if (!hfs_inode_cachep) |
| 448 | return -ENOMEM; | 448 | return -ENOMEM; |
| 449 | err = register_filesystem(&hfs_fs_type); | 449 | err = register_filesystem(&hfs_fs_type); |