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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 3F91EC43215 for ; Fri, 22 Nov 2019 11:09:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 08A7F2071F for ; Fri, 22 Nov 2019 11:09:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574420972; bh=YYe5W2s4uT8XKIJixlnbmBKQx8UvHF7KJNTAeeQqL4I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=O+gDPcUQRzq2/GMglr58SoFLt1B+Bt++YAYgU2/lkGqMSfaddiDadB+bMKpYvxRhL eUHhTNMSH4efCCVVNEpRywYzkSs28VKUfgj6NVloCPITwqj1xIEFArvdoRYyqAKqwm vk2lMsizYEpkf3nRWeFNXJsEwC9mmz5t41Ji8sBU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727989AbfKVLDK (ORCPT ); Fri, 22 Nov 2019 06:03:10 -0500 Received: from mail.kernel.org ([198.145.29.99]:57170 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727667AbfKVLDI (ORCPT ); Fri, 22 Nov 2019 06:03:08 -0500 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 E24402073F; Fri, 22 Nov 2019 11:03:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574420588; bh=YYe5W2s4uT8XKIJixlnbmBKQx8UvHF7KJNTAeeQqL4I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zBgLiP8NSL6Uereuz8ah/pT/ZcPLNLbfJk/481AiY3G9+GDpfUr7aTcLtndESJF+G fIkipPeQecc9QlWIC6hkp5YycwKyP8zqgm9F9MYyHIkrWFAoooxr16IWG0g8nXftVd ktYNXVlbkVZChQP4ETCiBrHNwZHGapRpWCCrz6gE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Shenghui Wang , Coly Li , Jens Axboe , Sasha Levin Subject: [PATCH 4.19 157/220] bcache: recal cached_dev_sectors on detach Date: Fri, 22 Nov 2019 11:28:42 +0100 Message-Id: <20191122100923.999364908@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100912.732983531@linuxfoundation.org> References: <20191122100912.732983531@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: Shenghui Wang [ Upstream commit 46010141da6677b81cc77f9b47f8ac62bd1cbfd3 ] Recal cached_dev_sectors on cached_dev detached, as recal done on cached_dev attached. Update the cached_dev_sectors before bcache_device_detach called as bcache_device_detach will set bcache_device->c to NULL. Signed-off-by: Shenghui Wang Signed-off-by: Coly Li Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/md/bcache/super.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c index c4da2fe623e9e..4998b4cae9c11 100644 --- a/drivers/md/bcache/super.c +++ b/drivers/md/bcache/super.c @@ -1009,6 +1009,7 @@ static void cached_dev_detach_finish(struct work_struct *w) bch_write_bdev_super(dc, &cl); closure_sync(&cl); + calc_cached_dev_sectors(dc->disk.c); bcache_device_detach(&dc->disk); list_move(&dc->list, &uncached_devices); -- 2.20.1