aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorDuane Griffin <duaneg@dghda.com>2008-04-17 10:38:59 -0400
committerTheodore Ts'o <tytso@mit.edu>2008-04-17 10:38:59 -0400
commit8a9362eb405e380432e6883cb83830df3b6cdf78 (patch)
tree1d08110f16c6464fea804fc1dfb59e0573c559b3 /fs
parent83c49523c91fff10493f5b3c102063b02ab76907 (diff)
jbd2: replace potentially false assertion with if block
If an error occurs during jbd2 cache initialisation it is possible for the journal_head_cache to be NULL when jbd2_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 jbd2 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: Mingming Cao <cmm@us.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs')
-rw-r--r--fs/jbd2/journal.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index eb7eb6c27bcb..2dbf23e82c6f 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -1976,9 +1976,10 @@ static int journal_init_jbd2_journal_head_cache(void)
1976 1976
1977static void jbd2_journal_destroy_jbd2_journal_head_cache(void) 1977static void jbd2_journal_destroy_jbd2_journal_head_cache(void)
1978{ 1978{
1979 J_ASSERT(jbd2_journal_head_cache != NULL); 1979 if (jbd2_journal_head_cache) {
1980 kmem_cache_destroy(jbd2_journal_head_cache); 1980 kmem_cache_destroy(jbd2_journal_head_cache);
1981 jbd2_journal_head_cache = NULL; 1981 jbd2_journal_head_cache = NULL;
1982 }
1982} 1983}
1983 1984
1984/* 1985/*