diff options
| author | Coly Li | 2019-06-28 13:59:53 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-07-26 09:14:21 +0200 |
| commit | 4fc48cd21a31e6560a6cfab0ac7c248b1ee7921c (patch) | |
| tree | e30059b14d98ec8b1b995150c5657cd733c607ca | |
| parent | bcache: Revert "bcache: fix high CPU occupancy during journal" (diff) | |
| download | kernel-qcow2-linux-4fc48cd21a31e6560a6cfab0ac7c248b1ee7921c.tar.gz kernel-qcow2-linux-4fc48cd21a31e6560a6cfab0ac7c248b1ee7921c.tar.xz kernel-qcow2-linux-4fc48cd21a31e6560a6cfab0ac7c248b1ee7921c.zip | |
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>
| -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 0eb853e2a29d..ec1e35a62934 100644 --- a/drivers/md/bcache/journal.c +++ b/drivers/md/bcache/journal.c @@ -842,7 +842,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) |