jbd: replace potentially false assertion with if block
If an error occurs during jbd cache initialisation it is possible for the journal_head_cache to be NULL when journal_destroy_journal_head_cache is called. Replace the J_ASSERT with an if block to handle the situation correctly. Note that even with this fix things will break badly if jbd is statically compiled in and cache initialisation fails. Signed-off-by: Duane Griffin <duaneg@dghda.com Cc: <linux-ext4@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
d06bf1d252
commit
3850f7a521
|
@ -1636,9 +1636,10 @@ static int journal_init_journal_head_cache(void)
|
|||
|
||||
static void journal_destroy_journal_head_cache(void)
|
||||
{
|
||||
J_ASSERT(journal_head_cache != NULL);
|
||||
kmem_cache_destroy(journal_head_cache);
|
||||
journal_head_cache = NULL;
|
||||
if (journal_head_cache) {
|
||||
kmem_cache_destroy(journal_head_cache);
|
||||
journal_head_cache = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
Loading…
Reference in a new issue