diff options
| author |   Johann Lombardi <johann.lombardi@bull.net> | 2006-10-11 01:21:00 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-11 11:14:15 -0700 |
| commit | a920e9416b3469994860ab552dfd7fd5a5aff162 (patch) | |
| tree | 9919991a89614a059fafd91b93666e8487606f3d /fs/jbd2 | |
| parent | [PATCH] jbd2: rename jbd2 symbols to avoid duplication of jbd symbols (diff) | |
| download | linux-dev-a920e9416b3469994860ab552dfd7fd5a5aff162.tar.xz linux-dev-a920e9416b3469994860ab552dfd7fd5a5aff162.zip | |
[PATCH] jbd2: rename slab
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>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/jbd2')
| -rw-r--r-- | fs/jbd2/journal.c | 6 | ||||
| -rw-r--r-- | fs/jbd2/revoke.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index 3fbbba20a516..8d0f71e562fe 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c @@ -1631,7 +1631,7 @@ void * __jbd2_kmalloc (const char *where, size_t size, gfp_t flags, int retry) 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_head_cache(void) 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 --git a/fs/jbd2/revoke.c b/fs/jbd2/revoke.c index 2fccddc7acad..5820a0c5ad26 100644 --- a/fs/jbd2/revoke.c +++ b/fs/jbd2/revoke.c @@ -168,13 +168,13 @@ static struct jbd2_revoke_record_s *find_revoke_record(journal_t *journal, 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) { |