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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,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 289F3C04E84 for ; Wed, 15 May 2019 11:57:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EF2F72084A for ; Wed, 15 May 2019 11:57:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557921430; bh=1UczZCQc5x+59X5jdJ/yq07EnrU2Dd/9+SuVc8m4S8A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=N+PDYJN3O4alVfYSBY1VzxDBM/W60aw+ya9pC+Ta3oKHzCcjyV35eM0k9kTwoewpf WOdp8w1jVJzsw4efbGS4PgjNtGbLhDHZ55pKXomIHYIziQocPPmbd87Iet7J9oaLLG oBZGOxeVmUTNwx9wAVNQEM+gQoecRLki73QspUn8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730347AbfEOL5I (ORCPT ); Wed, 15 May 2019 07:57:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:54540 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730377AbfEOLRU (ORCPT ); Wed, 15 May 2019 07:17:20 -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 AEC452084E; Wed, 15 May 2019 11:17:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557919040; bh=1UczZCQc5x+59X5jdJ/yq07EnrU2Dd/9+SuVc8m4S8A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zDrX+sCHyVJ+mAsY7B2h03YU89pY2QIkF7n3FnGAd8mAlmz5q4mGqv1XKgbYal6// jd2EGUxIyQA4TkomFeLVqJHxeaBa1QYDzATuTc3xYX40J+TVOQEGwoSOSGg6Gj5K+g 5N8M1AIbwXNakYaVopuilEb+FZ994Q+JjZ42Vl7w= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tang Junhui , Coly Li , Jens Axboe , Sasha Levin Subject: [PATCH 4.14 043/115] bcache: correct dirty data statistics Date: Wed, 15 May 2019 12:55:23 +0200 Message-Id: <20190515090702.631103131@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190515090659.123121100@linuxfoundation.org> References: <20190515090659.123121100@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 [ Upstream commit 2e17a262a2371d38d2ec03614a2675a32cef9912 ] When bcache device is clean, dirty keys may still exist after journal replay, so we need to count these dirty keys even device in clean status, otherwise after writeback, the amount of dirty data would be incorrect. Signed-off-by: Tang Junhui Cc: stable@vger.kernel.org Signed-off-by: Coly Li Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/md/bcache/super.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c index fe6e4c319b7cf..9e875aba41b9b 100644 --- a/drivers/md/bcache/super.c +++ b/drivers/md/bcache/super.c @@ -1045,12 +1045,13 @@ int bch_cached_dev_attach(struct cached_dev *dc, struct cache_set *c, } if (BDEV_STATE(&dc->sb) == BDEV_STATE_DIRTY) { - bch_sectors_dirty_init(&dc->disk); atomic_set(&dc->has_dirty, 1); atomic_inc(&dc->count); bch_writeback_queue(dc); } + bch_sectors_dirty_init(&dc->disk); + bch_cached_dev_run(dc); bcache_device_link(&dc->disk, c, "bdev"); -- 2.20.1