From 0f01a620809c14a5bd1ad7ed051948c82647598f Mon Sep 17 00:00:00 2001 From: Duane Griffin Date: Fri, 25 Jul 2008 01:46:19 -0700 Subject: [PATCH] --- yaml --- r: 105842 b: refs/heads/master c: 3850f7a521dc17659ef6758a219f083418788490 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/jbd/journal.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 83551c9a3e7a..f5540eb21a99 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d06bf1d252fe16f5f0d13e04da7a9913420aa1cf +refs/heads/master: 3850f7a521dc17659ef6758a219f083418788490 diff --git a/trunk/fs/jbd/journal.c b/trunk/fs/jbd/journal.c index b99c3b3654c4..15ea16ad8662 100644 --- a/trunk/fs/jbd/journal.c +++ b/trunk/fs/jbd/journal.c @@ -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; + } } /*