On Wed, Sep 20, 2006 at 10:56:39AM -0500, Dave Kleikamp wrote:
> # These next 4 copy clone jdb2 from jbd and modify ext4 to use it
> jbd2-copy.patch
> jbd2-rename.patch

jbd and jbd2 currently use the same slab names which must be unique.
The patch below just renames jbd2's slabs.

Signed-off-by: Johann Lombardi <johann.lombardi@bull.net>

Index: linux-2.6.18-mm1/fs/jbd2/journal.c
===================================================================
---
diff -Nurp linux005/fs/jbd2/journal.c linux006/fs/jbd2/journal.c
--- linux005/fs/jbd2/journal.c	2006-10-05 07:39:07.000000000 -0500
+++ linux006/fs/jbd2/journal.c	2006-10-05 07:39:07.000000000 -0500
@@ -1631,7 +1631,7 @@ void * __jbd2_kmalloc (const char *where
 
 static kmem_cache_t *jbd_slab[JBD_MAX_SLABS];
 static const char *jbd_slab_names[JBD_MAX_SLABS] = {
-	"jbd_1k", "jbd_2k", "jbd_4k", NULL, "jbd_8k"
+	"jbd2_1k", "jbd2_2k", "jbd2_4k", NULL, "jbd2_8k"
 };
 
 static void jbd2_journal_destroy_jbd_slabs(void)
@@ -1702,7 +1702,7 @@ static int journal_init_jbd2_journal_hea
 	int retval;
 
 	J_ASSERT(jbd2_journal_head_cache == 0);
-	jbd2_journal_head_cache = kmem_cache_create("journal_head",
+	jbd2_journal_head_cache = kmem_cache_create("jbd2_journal_head",
 				sizeof(struct journal_head),
 				0,		/* offset */
 				0,		/* flags */
@@ -1999,7 +1999,7 @@ kmem_cache_t *jbd2_handle_cache;
 
 static int __init journal_init_handle_cache(void)
 {
-	jbd2_handle_cache = kmem_cache_create("journal_handle",
+	jbd2_handle_cache = kmem_cache_create("jbd2_journal_handle",
 				sizeof(handle_t),
 				0,		/* offset */
 				0,		/* flags */
diff -Nurp linux005/fs/jbd2/revoke.c linux006/fs/jbd2/revoke.c
--- linux005/fs/jbd2/revoke.c	2006-10-05 07:39:07.000000000 -0500
+++ linux006/fs/jbd2/revoke.c	2006-10-05 07:39:07.000000000 -0500
@@ -168,13 +168,13 @@ static struct jbd2_revoke_record_s *find
 
 int __init jbd2_journal_init_revoke_caches(void)
 {
-	jbd2_revoke_record_cache = kmem_cache_create("revoke_record",
+	jbd2_revoke_record_cache = kmem_cache_create("jbd2_revoke_record",
 					   sizeof(struct jbd2_revoke_record_s),
 					   0, SLAB_HWCACHE_ALIGN, NULL, NULL);
 	if (jbd2_revoke_record_cache == 0)
 		return -ENOMEM;
 
-	jbd2_revoke_table_cache = kmem_cache_create("revoke_table",
+	jbd2_revoke_table_cache = kmem_cache_create("jbd2_revoke_table",
 					   sizeof(struct jbd2_revoke_table_s),
 					   0, 0, NULL, NULL);
 	if (jbd2_revoke_table_cache == 0) {