The patch titled
jbd2: rename slab
has been removed from the -mm tree. Its filename is
jbd2-rename-slab.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: jbd2: rename slab
From: Johann Lombardi <johann.lombardi@xxxxxxxx>
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@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/jbd2/journal.c | 6 +++---
fs/jbd2/revoke.c | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff -puN fs/jbd2/journal.c~jbd2-rename-slab fs/jbd2/journal.c
--- a/fs/jbd2/journal.c~jbd2-rename-slab
+++ a/fs/jbd2/journal.c
@@ -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 -puN fs/jbd2/revoke.c~jbd2-rename-slab fs/jbd2/revoke.c
--- a/fs/jbd2/revoke.c~jbd2-rename-slab
+++ a/fs/jbd2/revoke.c
@@ -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) {
_
Patches currently in -mm which might be from johann.lombardi@xxxxxxxx are
origin.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
