Received: by 2002:a17:90a:88:0:0:0:0 with SMTP id a8csp32589pja; Fri, 22 Nov 2019 03:05:16 -0800 (PST) X-Google-Smtp-Source: APXvYqzadqDRzytSsaZlp0wXE51Z7mnBNh72iDOS1FUdhbDPTVziwX4/zZ+c8gFnbPyr54XRMU0F X-Received: by 2002:a17:906:e087:: with SMTP id gh7mr21296784ejb.278.1574420715878; Fri, 22 Nov 2019 03:05:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574420715; cv=none; d=google.com; s=arc-20160816; b=ZiJJ0hb6qLs3tIX4FAOOYbvI3gYbm0VlVhMFisPMK1gCcX9RZx7pHXysk1F1cRY57O 04u2yqTChUsl5uYxdWgjMdsm9ltZF88AaMNG+pwv92WmyWQQwkHPOO1cCkm9Q/rEphuF /KGP3WPP+B+ZZOmkg3zRxyOT1VvbSOAIh71tU91s63BNjJUw7elaQnAr5pk5OIRYLr+D joPoR6NnglM8d3qaBna5lyrfTUG+3puP6i9u5F+ir4mgAUQQGw7guwCXdLTELiXbanzF egQbM67gZg9hD1dqdR+UqszNw05dWmOq0cIwz6B7q70hde25teiN/RS/4RwDh1YiYEYB rlAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=h9mGkptH7crqXoPbpkcKMN1aN7GlKkLt/oKWNaOyMs0=; b=BiPzig7nX/lc/I+vADwPPBthjII8dIL5ye8SZot2qOOmWWRwR2WO+APcgjOXKIhhnD wbHZBFdOj3fosrR+7xXiJVKxfmIpEwkI4t2+oc3mYomAgY4tyddMIOMtLjDmoTk5TBs7 GrBGDWfjjaCtjJiAWKm0NXGVpw6HipIWFyVpS2BToroGom1NuelJyf8v9ve8RDCLNIPs pqRJSckTKGwzS1mRyKZWut0dLyeDWl1y13XRMXOPbBoAUj0/BkuZn+kHMRQxAQzkIcHP 8FQe7r9CDowx+MqG+Y05oVdwCrTLmszqYKpxD9JD/Ewg33sYaVtW5NeHyfmaZZUiu9Eo oF4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=zBgLiP8N; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v10si4873835edc.62.2019.11.22.03.04.51; Fri, 22 Nov 2019 03:05:15 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=zBgLiP8N; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728249AbfKVLDU (ORCPT + 99 others); Fri, 22 Nov 2019 06:03:20 -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: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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