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/ocfs2/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/ocfs2/super.c')
| -rw-r--r-- | fs/ocfs2/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c index 3a5a1ed09ac9..200c7d4790dc 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c | |||
| @@ -984,7 +984,7 @@ static int ocfs2_initialize_mem_caches(void) | |||
| 984 | 0, | 984 | 0, |
| 985 | (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT| | 985 | (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT| |
| 986 | SLAB_MEM_SPREAD), | 986 | SLAB_MEM_SPREAD), |
| 987 | ocfs2_inode_init_once, NULL); | 987 | ocfs2_inode_init_once); |
| 988 | if (!ocfs2_inode_cachep) | 988 | if (!ocfs2_inode_cachep) |
| 989 | return -ENOMEM; | 989 | return -ENOMEM; |
| 990 | 990 | ||