aboutsummaryrefslogtreecommitdiffstats
path: root/fs/jbd
diff options
context:
space:
mode:
authorDuane Griffin <duaneg@dghda.com>2008-07-25 04:46:19 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-25 13:53:32 -0400
commit3850f7a521dc17659ef6758a219f083418788490 (patch)
treed576d48a13f4c31aef846dd7f178f3159c38e138 /fs/jbd
parentd06bf1d252fe16f5f0d13e04da7a9913420aa1cf (diff)
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>
Diffstat (limited to 'fs/jbd')
-rw-r--r--fs/jbd/journal.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c
index b99c3b3654c4..15ea16ad8662 100644
--- a/fs/jbd/journal.c
+++ b/fs/jbd/journal.c
@@ -1636,9 +1636,10 @@ static int journal_init_journal_head_cache(void)
1636 1636
1637static void journal_destroy_journal_head_cache(void) 1637static void journal_destroy_journal_head_cache(void)
1638{ 1638{
1639 J_ASSERT(journal_head_cache != NULL); 1639 if (journal_head_cache) {
1640 kmem_cache_destroy(journal_head_cache); 1640 kmem_cache_destroy(journal_head_cache);
1641 journal_head_cache = NULL; 1641 journal_head_cache = NULL;
1642 }
1642} 1643}
1643 1644
1644/* 1645/*