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/hpfs/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/hpfs/super.c')
-rw-r--r-- | fs/hpfs/super.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/hpfs/super.c b/fs/hpfs/super.c index 29cc34abb2ea..89612ee7c80d 100644 --- a/fs/hpfs/super.c +++ b/fs/hpfs/super.c | |||
@@ -181,14 +181,14 @@ static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flag | |||
181 | mutex_init(&ei->i_parent_mutex); | 181 | mutex_init(&ei->i_parent_mutex); |
182 | inode_init_once(&ei->vfs_inode); | 182 | inode_init_once(&ei->vfs_inode); |
183 | } | 183 | } |
184 | 184 | ||
185 | static int init_inodecache(void) | 185 | static int init_inodecache(void) |
186 | { | 186 | { |
187 | hpfs_inode_cachep = kmem_cache_create("hpfs_inode_cache", | 187 | hpfs_inode_cachep = kmem_cache_create("hpfs_inode_cache", |
188 | sizeof(struct hpfs_inode_info), | 188 | sizeof(struct hpfs_inode_info), |
189 | 0, (SLAB_RECLAIM_ACCOUNT| | 189 | 0, (SLAB_RECLAIM_ACCOUNT| |
190 | SLAB_MEM_SPREAD), | 190 | SLAB_MEM_SPREAD), |
191 | init_once, NULL); | 191 | init_once); |
192 | if (hpfs_inode_cachep == NULL) | 192 | if (hpfs_inode_cachep == NULL) |
193 | return -ENOMEM; | 193 | return -ENOMEM; |
194 | return 0; | 194 | return 0; |