|
@@ -2017,7 +2017,7 @@ static struct kmem_cache *jbd2_journal_head_cache;
|
|
|
static atomic_t nr_journal_heads = ATOMIC_INIT(0);
|
|
|
#endif
|
|
|
|
|
|
-static int journal_init_jbd2_journal_head_cache(void)
|
|
|
+static int jbd2_journal_init_journal_head_cache(void)
|
|
|
{
|
|
|
int retval;
|
|
|
|
|
@@ -2035,7 +2035,7 @@ static int journal_init_jbd2_journal_head_cache(void)
|
|
|
return retval;
|
|
|
}
|
|
|
|
|
|
-static void jbd2_journal_destroy_jbd2_journal_head_cache(void)
|
|
|
+static void jbd2_journal_destroy_journal_head_cache(void)
|
|
|
{
|
|
|
if (jbd2_journal_head_cache) {
|
|
|
kmem_cache_destroy(jbd2_journal_head_cache);
|
|
@@ -2323,7 +2323,7 @@ static void __exit jbd2_remove_jbd_stats_proc_entry(void)
|
|
|
|
|
|
struct kmem_cache *jbd2_handle_cache, *jbd2_inode_cache;
|
|
|
|
|
|
-static int __init journal_init_handle_cache(void)
|
|
|
+static int __init jbd2_journal_init_handle_cache(void)
|
|
|
{
|
|
|
jbd2_handle_cache = KMEM_CACHE(jbd2_journal_handle, SLAB_TEMPORARY);
|
|
|
if (jbd2_handle_cache == NULL) {
|
|
@@ -2358,9 +2358,9 @@ static int __init journal_init_caches(void)
|
|
|
|
|
|
ret = jbd2_journal_init_revoke_caches();
|
|
|
if (ret == 0)
|
|
|
- ret = journal_init_jbd2_journal_head_cache();
|
|
|
+ ret = jbd2_journal_init_journal_head_cache();
|
|
|
if (ret == 0)
|
|
|
- ret = journal_init_handle_cache();
|
|
|
+ ret = jbd2_journal_init_handle_cache();
|
|
|
if (ret == 0)
|
|
|
ret = jbd2_journal_init_transaction_cache();
|
|
|
return ret;
|
|
@@ -2369,7 +2369,7 @@ static int __init journal_init_caches(void)
|
|
|
static void jbd2_journal_destroy_caches(void)
|
|
|
{
|
|
|
jbd2_journal_destroy_revoke_caches();
|
|
|
- jbd2_journal_destroy_jbd2_journal_head_cache();
|
|
|
+ jbd2_journal_destroy_journal_head_cache();
|
|
|
jbd2_journal_destroy_handle_cache();
|
|
|
jbd2_journal_destroy_transaction_cache();
|
|
|
jbd2_journal_destroy_slabs();
|