bcache: Revert "bcache: free heap cache_set->flush_btree in bch_journal_free"

commit ba82c1ac1667d6efb91a268edb13fc9cdaecec9b upstream.

This reverts commit 6268dc2c4703aabfb0b35681be709acf4c2826c6.

This patch depends on commit c4dc2497d50d ("bcache: fix high CPU
occupancy during journal") which is reverted in previous patch. So
revert this one too.

Fixes: 6268dc2c4703 ("bcache: free heap cache_set->flush_btree in bch_journal_free")
Signed-off-by: Coly Li <colyli@suse.de>
Cc: stable@vger.kernel.org
Cc: Shenghui Wang <shhuiw@foxmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/md/bcache/journal.c b/drivers/md/bcache/journal.c
index 49d4acd77deeae16589c0e236188d173b027751b..cae2aff5e27ae1528a40247155be398deb3fe047 100644 (file)
--- a/drivers/md/bcache/journal.c
+++ b/drivers/md/bcache/journal.c
@@ -843,7 +843,6 @@ void bch_journal_free(struct cache_set *c)
        free_pages((unsigned long) c->journal.w[1].data, JSET_BITS);
        free_pages((unsigned long) c->journal.w[0].data, JSET_BITS);
        free_fifo(&c->journal.pin);
-       free_heap(&c->flush_btree);
 }
 
 int bch_journal_alloc(struct cache_set *c)