diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2007-07-20 03:11:58 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2007-07-20 03:11:58 +0200 |
| commit | 20c2df83d25c6a95affe6157a4c9cac4cf5ffaac (patch) | |
| tree | 415c4453d2b17a50abe7a3e515177e1fa337bd67 /fs/ocfs2/dlm | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6 (diff) | |
| download | linux-20c2df83d25c6a95affe6157a4c9cac4cf5ffaac.tar.xz linux-20c2df83d25c6a95affe6157a4c9cac4cf5ffaac.zip | |
mm: Remove slab destructors from kmem_cache_create().
Slab destructors were no longer supported after Christoph's
c59def9f222d44bb7e2f0a559f2906191a0862d7 change. They've been
BUGs for both slab and slub, and slob never supported them
either.
This rips out support for the dtor pointer from kmem_cache_create()
completely and fixes up every single callsite in the kernel (there were
about 224, not including the slab allocator definitions themselves,
or the documentation references).
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'fs/ocfs2/dlm')
| -rw-r--r-- | fs/ocfs2/dlm/dlmfs.c | 2 | ||||
| -rw-r--r-- | fs/ocfs2/dlm/dlmmaster.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/ocfs2/dlm/dlmfs.c b/fs/ocfs2/dlm/dlmfs.c index fd8cb1badc9b..7418dc83de1c 100644 --- a/fs/ocfs2/dlm/dlmfs.c +++ b/fs/ocfs2/dlm/dlmfs.c @@ -592,7 +592,7 @@ static int __init init_dlmfs_fs(void) sizeof(struct dlmfs_inode_private), 0, (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT| SLAB_MEM_SPREAD), - dlmfs_init_once, NULL); + dlmfs_init_once); if (!dlmfs_inode_cache) return -ENOMEM; cleanup_inode = 1; diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c index 65b2b9b92688..62e4a7daa286 100644 --- a/fs/ocfs2/dlm/dlmmaster.c +++ b/fs/ocfs2/dlm/dlmmaster.c @@ -510,7 +510,7 @@ int dlm_init_mle_cache(void) dlm_mle_cache = kmem_cache_create("dlm_mle_cache", sizeof(struct dlm_master_list_entry), 0, SLAB_HWCACHE_ALIGN, - NULL, NULL); + NULL); if (dlm_mle_cache == NULL) return -ENOMEM; return 0; |