AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

jbd2: remove NULL check before calling kmem_cache_destroy()

Browse Source 
The kmem_cache_destroy() function already checks for null pointers, so
we can remove the check at the call site.

This patch also sets jbd2_handle_cache and jbd2_inode_cache to be NULL
after freeing them in jbd2_journal_destroy_handle_cache().

Signed-off-by: Wang Long <wanglong19@meituan.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Reviewed-by: Jan Kara <jack@suse.cz>
This commit is contained in:
Wang Long 2018-05-20 22:38:26 -04:00 committed by Theodore Ts'o
parent 9196f57151
commit 8bdd5b60e0
3 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fs/jbd2/journal.c
View File

@ -2302,8 +2302,7 @@ static void jbd2_journal_destroy_slabs(void)
int i; int i;
for (i = 0; i < JBD2_MAX_SLABS; i++) { for (i = 0; i < JBD2_MAX_SLABS; i++) {
if (jbd2_slab[i]) kmem_cache_destroy(jbd2_slab[i]);
kmem_cache_destroy(jbd2_slab[i]);
jbd2_slab[i] = NULL; jbd2_slab[i] = NULL;
} }
} }
@ -2404,10 +2403,8 @@ static int jbd2_journal_init_journal_head_cache(void)
static void jbd2_journal_destroy_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);
kmem_cache_destroy(jbd2_journal_head_cache); jbd2_journal_head_cache = NULL;
jbd2_journal_head_cache = NULL;
}
} }
/* /*
@ -2665,11 +2662,10 @@ static int __init jbd2_journal_init_handle_cache(void)
static void jbd2_journal_destroy_handle_cache(void) static void jbd2_journal_destroy_handle_cache(void)
{ {
if (jbd2_handle_cache) kmem_cache_destroy(jbd2_handle_cache);
kmem_cache_destroy(jbd2_handle_cache); jbd2_handle_cache = NULL;
if (jbd2_inode_cache) kmem_cache_destroy(jbd2_inode_cache);
kmem_cache_destroy(jbd2_inode_cache); jbd2_inode_cache = NULL;
} }
/* /*

12
fs/jbd2/revoke.c
View File

@ -180,14 +180,10 @@ static struct jbd2_revoke_record_s *find_revoke_record(journal_t *journal,
void jbd2_journal_destroy_revoke_caches(void) void jbd2_journal_destroy_revoke_caches(void)
{ {
if (jbd2_revoke_record_cache) { kmem_cache_destroy(jbd2_revoke_record_cache);
kmem_cache_destroy(jbd2_revoke_record_cache); jbd2_revoke_record_cache = NULL;
jbd2_revoke_record_cache = NULL; kmem_cache_destroy(jbd2_revoke_table_cache);
} jbd2_revoke_table_cache = NULL;
if (jbd2_revoke_table_cache) {
kmem_cache_destroy(jbd2_revoke_table_cache);
jbd2_revoke_table_cache = NULL;
}
} }
int __init jbd2_journal_init_revoke_caches(void) int __init jbd2_journal_init_revoke_caches(void)

6
fs/jbd2/transaction.c
View File

@ -49,10 +49,8 @@ int __init jbd2_journal_init_transaction_cache(void)
void jbd2_journal_destroy_transaction_cache(void) void jbd2_journal_destroy_transaction_cache(void)
{ {
if (transaction_cache) { kmem_cache_destroy(transaction_cache);
kmem_cache_destroy(transaction_cache); transaction_cache = NULL;
transaction_cache = NULL;
}
} }
void jbd2_journal_free_transaction(transaction_t *transaction) void jbd2_journal_free_transaction(transaction_t *transaction)