From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 80DA3C76191 for ; Wed, 24 Jul 2019 19:57:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 53E7D206BA for ; Wed, 24 Jul 2019 19:57:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563998255; bh=2/S1hdU4cTruU/hKmKnpGuGjMHYqBrbHfZvNHrsHGH0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=G83m2PzGkJ6sKoxs+p1UkhDuP2XJLmO5hDvShlkShf4bV2uXwLuJTQIHCMy1xsd4P 26E9ccA5eLigHsyCIvphy17VNPOz51AvkTa4Up5puSUBCf6XVcwZ5tXgqkcIAMia95 PrAEY7q2mEBBgkgWxAeqS5txuAtJ8zZpqmyMqxPQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390624AbfGXT5e (ORCPT ); Wed, 24 Jul 2019 15:57:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:43044 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392020AbfGXT5d (ORCPT ); Wed, 24 Jul 2019 15:57:33 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id AE06620665; Wed, 24 Jul 2019 19:57:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563998253; bh=2/S1hdU4cTruU/hKmKnpGuGjMHYqBrbHfZvNHrsHGH0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eKMiWqu24OhZVu5VkBUeb3BnaFQfS3PsoDHswIqehy3D+DkVzga1L/kCvJUgo8YDq NH2P5dJjPqDSwgiBZDrBe0MyySjDTXdmLcgGp5zdxUsjrVmdv55W8wCj/duQcysZXK YKzXrRgT5GOGXJa6nOyO2aR8bUgUFraVhTwIC5s0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Coly Li , Shenghui Wang , Jens Axboe Subject: [PATCH 5.1 258/371] bcache: Revert "bcache: free heap cache_set->flush_btree in bch_journal_free" Date: Wed, 24 Jul 2019 21:20:10 +0200 Message-Id: <20190724191743.944019216@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190724191724.382593077@linuxfoundation.org> References: <20190724191724.382593077@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Coly Li 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 Cc: stable@vger.kernel.org Cc: Shenghui Wang Signed-off-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman --- drivers/md/bcache/journal.c | 1 - 1 file changed, 1 deletion(-) --- a/drivers/md/bcache/journal.c +++ b/drivers/md/bcache/journal.c @@ -842,7 +842,6 @@ void bch_journal_free(struct cache_set * 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)