diff options
| author | Coly Li <colyli@suse.de> | 2019-06-28 19:59:53 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-07-26 09:10:52 +0200 |
| commit | e294fa562fadad697cd49e2d7883b1b95a8aa230 (patch) | |
| tree | 045cb7265ab2abd3c77e91aa6829a57e32a89924 /drivers/md/bcache | |
| parent | fe4a2764fd85185f9014beecc68510d1f9bdc958 (diff) | |
| download | linux-stable-e294fa562fadad697cd49e2d7883b1b95a8aa230.tar.gz linux-stable-e294fa562fadad697cd49e2d7883b1b95a8aa230.tar.bz2 linux-stable-e294fa562fadad697cd49e2d7883b1b95a8aa230.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>
Diffstat (limited to 'drivers/md/bcache')
| -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 49d4acd77dee..cae2aff5e27a 100644 --- 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) |