aboutsummaryrefslogtreecommitdiffstats
path: root/fs/jbd
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/jbd
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/jbd')
-rw-r--r--fs/jbd/journal.c8
-rw-r--r--fs/jbd/revoke.c4
2 files changed, 5 insertions, 7 deletions
diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c
index 46fe7439fb91..06ab3c10b1b8 100644
--- a/fs/jbd/journal.c
+++ b/fs/jbd/journal.c
@@ -1668,7 +1668,7 @@ static int journal_create_jbd_slab(size_t slab_size)
1668 * boundary. 1668 * boundary.
1669 */ 1669 */
1670 jbd_slab[i] = kmem_cache_create(jbd_slab_names[i], 1670 jbd_slab[i] = kmem_cache_create(jbd_slab_names[i],
1671 slab_size, slab_size, 0, NULL, NULL); 1671 slab_size, slab_size, 0, NULL);
1672 if (!jbd_slab[i]) { 1672 if (!jbd_slab[i]) {
1673 printk(KERN_EMERG "JBD: no memory for jbd_slab cache\n"); 1673 printk(KERN_EMERG "JBD: no memory for jbd_slab cache\n");
1674 return -ENOMEM; 1674 return -ENOMEM;
@@ -1711,8 +1711,7 @@ static int journal_init_journal_head_cache(void)
1711 sizeof(struct journal_head), 1711 sizeof(struct journal_head),
1712 0, /* offset */ 1712 0, /* offset */
1713 0, /* flags */ 1713 0, /* flags */
1714 NULL, /* ctor */ 1714 NULL); /* ctor */
1715 NULL); /* dtor */
1716 retval = 0; 1715 retval = 0;
1717 if (journal_head_cache == 0) { 1716 if (journal_head_cache == 0) {
1718 retval = -ENOMEM; 1717 retval = -ENOMEM;
@@ -2008,8 +2007,7 @@ static int __init journal_init_handle_cache(void)
2008 sizeof(handle_t), 2007 sizeof(handle_t),
2009 0, /* offset */ 2008 0, /* offset */
2010 0, /* flags */ 2009 0, /* flags */
2011 NULL, /* ctor */ 2010 NULL); /* ctor */
2012 NULL); /* dtor */
2013 if (jbd_handle_cache == NULL) { 2011 if (jbd_handle_cache == NULL) {
2014 printk(KERN_EMERG "JBD: failed to create handle cache\n"); 2012 printk(KERN_EMERG "JBD: failed to create handle cache\n");
2015 return -ENOMEM; 2013 return -ENOMEM;
diff --git a/fs/jbd/revoke.c b/fs/jbd/revoke.c
index 8db2fa25170b..62e13c8db132 100644
--- a/fs/jbd/revoke.c
+++ b/fs/jbd/revoke.c
@@ -170,13 +170,13 @@ int __init journal_init_revoke_caches(void)
170{ 170{
171 revoke_record_cache = kmem_cache_create("revoke_record", 171 revoke_record_cache = kmem_cache_create("revoke_record",
172 sizeof(struct jbd_revoke_record_s), 172 sizeof(struct jbd_revoke_record_s),
173 0, SLAB_HWCACHE_ALIGN, NULL, NULL); 173 0, SLAB_HWCACHE_ALIGN, NULL);
174 if (revoke_record_cache == 0) 174 if (revoke_record_cache == 0)
175 return -ENOMEM; 175 return -ENOMEM;
176 176
177 revoke_table_cache = kmem_cache_create("revoke_table", 177 revoke_table_cache = kmem_cache_create("revoke_table",
178 sizeof(struct jbd_revoke_table_s), 178 sizeof(struct jbd_revoke_table_s),
179 0, 0, NULL, NULL); 179 0, 0, NULL);
180 if (revoke_table_cache == 0) { 180 if (revoke_table_cache == 0) {
181 kmem_cache_destroy(revoke_record_cache); 181 kmem_cache_destroy(revoke_record_cache);
182 revoke_record_cache = NULL; 182 revoke_record_cache = NULL;