aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2007-07-19 21:11:58 -0400
committerPaul Mundt <lethal@linux-sh.org>2007-07-19 21:11:58 -0400
commit20c2df83d25c6a95affe6157a4c9cac4cf5ffaac (patch)
tree415c4453d2b17a50abe7a3e515177e1fa337bd67 /fs/ocfs2
parent64fb98fc40738ae1a98bcea9ca3145b89fb71524 (diff)
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')
-rw-r--r--fs/ocfs2/dlm/dlmfs.c2
-rw-r--r--fs/ocfs2/dlm/dlmmaster.c2
-rw-r--r--fs/ocfs2/super.c2
-rw-r--r--fs/ocfs2/uptodate.c2
4 files changed, 4 insertions, 4 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)
592 sizeof(struct dlmfs_inode_private), 592 sizeof(struct dlmfs_inode_private),
593 0, (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT| 593 0, (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|
594 SLAB_MEM_SPREAD), 594 SLAB_MEM_SPREAD),
595 dlmfs_init_once, NULL); 595 dlmfs_init_once);
596 if (!dlmfs_inode_cache) 596 if (!dlmfs_inode_cache)
597 return -ENOMEM; 597 return -ENOMEM;
598 cleanup_inode = 1; 598 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)
510 dlm_mle_cache = kmem_cache_create("dlm_mle_cache", 510 dlm_mle_cache = kmem_cache_create("dlm_mle_cache",
511 sizeof(struct dlm_master_list_entry), 511 sizeof(struct dlm_master_list_entry),
512 0, SLAB_HWCACHE_ALIGN, 512 0, SLAB_HWCACHE_ALIGN,
513 NULL, NULL); 513 NULL);
514 if (dlm_mle_cache == NULL) 514 if (dlm_mle_cache == NULL)
515 return -ENOMEM; 515 return -ENOMEM;
516 return 0; 516 return 0;
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
diff --git a/fs/ocfs2/uptodate.c b/fs/ocfs2/uptodate.c
index 39814b900fc0..4da8851f2b23 100644
--- a/fs/ocfs2/uptodate.c
+++ b/fs/ocfs2/uptodate.c
@@ -548,7 +548,7 @@ int __init init_ocfs2_uptodate_cache(void)
548{ 548{
549 ocfs2_uptodate_cachep = kmem_cache_create("ocfs2_uptodate", 549 ocfs2_uptodate_cachep = kmem_cache_create("ocfs2_uptodate",
550 sizeof(struct ocfs2_meta_cache_item), 550 sizeof(struct ocfs2_meta_cache_item),
551 0, SLAB_HWCACHE_ALIGN, NULL, NULL); 551 0, SLAB_HWCACHE_ALIGN, NULL);
552 if (!ocfs2_uptodate_cachep) 552 if (!ocfs2_uptodate_cachep)
553 return -ENOMEM; 553 return -ENOMEM;
554 554