Commit ba82c1ac authored Jun 28, 2019 by Coly Li Committed by Jens Axboe Jun 28, 2019

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



This reverts commit 6268dc2c.

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

Fixes: 6268dc2c ("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>

parent 1df3877f

drivers/md/bcache/journal.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -884,7 +884,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)

Admin message