diff options
-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) | |||
1631 | 1631 | ||
1632 | static kmem_cache_t *jbd_slab[JBD_MAX_SLABS]; | 1632 | static kmem_cache_t *jbd_slab[JBD_MAX_SLABS]; |
1633 | static const char *jbd_slab_names[JBD_MAX_SLABS] = { | 1633 | static const char *jbd_slab_names[JBD_MAX_SLABS] = { |
1634 | "jbd_1k", "jbd_2k", "jbd_4k", NULL, "jbd_8k" | 1634 | "jbd2_1k", "jbd2_2k", "jbd2_4k", NULL, "jbd2_8k" |
1635 | }; | 1635 | }; |
1636 | 1636 | ||
1637 | static void jbd2_journal_destroy_jbd_slabs(void) | 1637 | static void jbd2_journal_destroy_jbd_slabs(void) |
@@ -1702,7 +1702,7 @@ static int journal_init_jbd2_journal_head_cache(void) | |||
1702 | int retval; | 1702 | int retval; |
1703 | 1703 | ||
1704 | J_ASSERT(jbd2_journal_head_cache == 0); | 1704 | J_ASSERT(jbd2_journal_head_cache == 0); |
1705 | jbd2_journal_head_cache = kmem_cache_create("journal_head", | 1705 | jbd2_journal_head_cache = kmem_cache_create("jbd2_journal_head", |
1706 | sizeof(struct journal_head), | 1706 | sizeof(struct journal_head), |
1707 | 0, /* offset */ | 1707 | 0, /* offset */ |
1708 | 0, /* flags */ | 1708 | 0, /* flags */ |
@@ -1999,7 +1999,7 @@ kmem_cache_t *jbd2_handle_cache; | |||
1999 | 1999 | ||
2000 | static int __init journal_init_handle_cache(void) | 2000 | static int __init journal_init_handle_cache(void) |
2001 | { | 2001 | { |
2002 | jbd2_handle_cache = kmem_cache_create("journal_handle", | 2002 | jbd2_handle_cache = kmem_cache_create("jbd2_journal_handle", |
2003 | sizeof(handle_t), | 2003 | sizeof(handle_t), |
2004 | 0, /* offset */ | 2004 | 0, /* offset */ |
2005 | 0, /* flags */ | 2005 | 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, | |||
168 | 168 | ||
169 | int __init jbd2_journal_init_revoke_caches(void) | 169 | int __init jbd2_journal_init_revoke_caches(void) |
170 | { | 170 | { |
171 | jbd2_revoke_record_cache = kmem_cache_create("revoke_record", | 171 | jbd2_revoke_record_cache = kmem_cache_create("jbd2_revoke_record", |
172 | sizeof(struct jbd2_revoke_record_s), | 172 | sizeof(struct jbd2_revoke_record_s), |
173 | 0, SLAB_HWCACHE_ALIGN, NULL, NULL); | 173 | 0, SLAB_HWCACHE_ALIGN, NULL, NULL); |
174 | if (jbd2_revoke_record_cache == 0) | 174 | if (jbd2_revoke_record_cache == 0) |
175 | return -ENOMEM; | 175 | return -ENOMEM; |
176 | 176 | ||
177 | jbd2_revoke_table_cache = kmem_cache_create("revoke_table", | 177 | jbd2_revoke_table_cache = kmem_cache_create("jbd2_revoke_table", |
178 | sizeof(struct jbd2_revoke_table_s), | 178 | sizeof(struct jbd2_revoke_table_s), |
179 | 0, 0, NULL, NULL); | 179 | 0, 0, NULL, NULL); |
180 | if (jbd2_revoke_table_cache == 0) { | 180 | if (jbd2_revoke_table_cache == 0) { |