diff --git a/[refs] b/[refs] index 6966504b0c8c..8740827b2ce9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 83c49523c91fff10493f5b3c102063b02ab76907 +refs/heads/master: 8a9362eb405e380432e6883cb83830df3b6cdf78 diff --git a/trunk/fs/jbd2/journal.c b/trunk/fs/jbd2/journal.c index eb7eb6c27bcb..2dbf23e82c6f 100644 --- a/trunk/fs/jbd2/journal.c +++ b/trunk/fs/jbd2/journal.c @@ -1976,9 +1976,10 @@ static int journal_init_jbd2_journal_head_cache(void) static void jbd2_journal_destroy_jbd2_journal_head_cache(void) { - J_ASSERT(jbd2_journal_head_cache != NULL); - kmem_cache_destroy(jbd2_journal_head_cache); - jbd2_journal_head_cache = NULL; + if (jbd2_journal_head_cache) { + kmem_cache_destroy(jbd2_journal_head_cache); + jbd2_journal_head_cache = NULL; + } } /*