aboutsummaryrefslogtreecommitdiffstats
path: root/fs/jbd2
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/jbd2
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/jbd2')
-rw-r--r--fs/jbd2/journal.c8
-rw-r--r--fs/jbd2/revoke.c4
2 files changed, 5 insertions, 7 deletions
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index f290cb7cb834..f37324aee817 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -1680,7 +1680,7 @@ static int jbd2_journal_create_jbd_slab(size_t slab_size)
1680 * boundary. 1680 * boundary.
1681 */ 1681 */
1682 jbd_slab[i] = kmem_cache_create(jbd_slab_names[i], 1682 jbd_slab[i] = kmem_cache_create(jbd_slab_names[i],
1683 slab_size, slab_size, 0, NULL, NULL); 1683 slab_size, slab_size, 0, NULL);
1684 if (!jbd_slab[i]) { 1684 if (!jbd_slab[i]) {
1685 printk(KERN_EMERG "JBD: no memory for jbd_slab cache\n"); 1685 printk(KERN_EMERG "JBD: no memory for jbd_slab cache\n");
1686 return -ENOMEM; 1686 return -ENOMEM;
@@ -1723,8 +1723,7 @@ static int journal_init_jbd2_journal_head_cache(void)
1723 sizeof(struct journal_head), 1723 sizeof(struct journal_head),
1724 0, /* offset */ 1724 0, /* offset */
1725 0, /* flags */ 1725 0, /* flags */
1726 NULL, /* ctor */ 1726 NULL); /* ctor */
1727 NULL); /* dtor */
1728 retval = 0; 1727 retval = 0;
1729 if (jbd2_journal_head_cache == 0) { 1728 if (jbd2_journal_head_cache == 0) {
1730 retval = -ENOMEM; 1729 retval = -ENOMEM;
@@ -2006,8 +2005,7 @@ static int __init journal_init_handle_cache(void)
2006 sizeof(handle_t), 2005 sizeof(handle_t),
2007 0, /* offset */ 2006 0, /* offset */
2008 0, /* flags */ 2007 0, /* flags */
2009 NULL, /* ctor */ 2008 NULL); /* ctor */
2010 NULL); /* dtor */
2011 if (jbd2_handle_cache == NULL) { 2009 if (jbd2_handle_cache == NULL) {
2012 printk(KERN_EMERG "JBD: failed to create handle cache\n"); 2010 printk(KERN_EMERG "JBD: failed to create handle cache\n");
2013 return -ENOMEM; 2011 return -ENOMEM;
diff --git a/fs/jbd2/revoke.c b/fs/jbd2/revoke.c
index 28cac049a56b..01d88975e0c5 100644
--- a/fs/jbd2/revoke.c
+++ b/fs/jbd2/revoke.c
@@ -171,13 +171,13 @@ int __init jbd2_journal_init_revoke_caches(void)
171{ 171{
172 jbd2_revoke_record_cache = kmem_cache_create("jbd2_revoke_record", 172 jbd2_revoke_record_cache = kmem_cache_create("jbd2_revoke_record",
173 sizeof(struct jbd2_revoke_record_s), 173 sizeof(struct jbd2_revoke_record_s),
174 0, SLAB_HWCACHE_ALIGN, NULL, NULL); 174 0, SLAB_HWCACHE_ALIGN, NULL);
175 if (jbd2_revoke_record_cache == 0) 175 if (jbd2_revoke_record_cache == 0)
176 return -ENOMEM; 176 return -ENOMEM;
177 177
178 jbd2_revoke_table_cache = kmem_cache_create("jbd2_revoke_table", 178 jbd2_revoke_table_cache = kmem_cache_create("jbd2_revoke_table",
179 sizeof(struct jbd2_revoke_table_s), 179 sizeof(struct jbd2_revoke_table_s),
180 0, 0, NULL, NULL); 180 0, 0, NULL);
181 if (jbd2_revoke_table_cache == 0) { 181 if (jbd2_revoke_table_cache == 0) {
182 kmem_cache_destroy(jbd2_revoke_record_cache); 182 kmem_cache_destroy(jbd2_revoke_record_cache);
183 jbd2_revoke_record_cache = NULL; 183 jbd2_revoke_record_cache = NULL;