diff options
| author | Coly Li <colyli@suse.de> | 2019-06-28 19:59:53 +0800 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2019-06-28 07:39:17 -0600 |
| commit | ba82c1ac1667d6efb91a268edb13fc9cdaecec9b (patch) | |
| tree | 4863952cef85d35c937e4664cbe679fdd71c58b1 /drivers | |
| parent | 1df3877ff6a4810054237c3259d900ded4468969 (diff) | |
| download | linux-stable-ba82c1ac1667d6efb91a268edb13fc9cdaecec9b.tar.gz linux-stable-ba82c1ac1667d6efb91a268edb13fc9cdaecec9b.tar.bz2 linux-stable-ba82c1ac1667d6efb91a268edb13fc9cdaecec9b.zip | |
bcache: Revert "bcache: free heap cache_set->flush_btree in bch_journal_free"
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/md/bcache/journal.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/md/bcache/journal.c b/drivers/md/bcache/journal.c index 3d321bffddc9..11d8c93b88bb 100644 --- a/drivers/md/bcache/journal.c +++ b/drivers/md/bcache/journal.c @@ -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) |