Received: by 2002:a25:683:0:0:0:0:0 with SMTP id 125csp577225ybg; Fri, 12 Jun 2020 09:03:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxzyP2wLlkcJmxn0uQmQc1lggNsAxx+54o3fLeid45kCFfiDE39ezUMI2De7+dIycQ9IFmW X-Received: by 2002:a17:906:fa03:: with SMTP id lo3mr14289372ejb.196.1591977804726; Fri, 12 Jun 2020 09:03:24 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1591977804; cv=pass; d=google.com; s=arc-20160816; b=Nw24yxDIwBMba4QlG3Wk1o255mwTp88Z1ZeC9VYrBoHNv1l9zg1gznoDQq/xxM7bKJ q4B2qfw30RHO2TcnPKmiTDq+mXlCuTP52bB6njpz8gB+7m+LuVRpLmL4z0Gu9LF3Vz8E GXVITECwGBczg/qbDOcW831Ruo2KqWQLoucDzhHSWl6f6TsUwqIMe8h288C4NJmmlbU0 /qPjtevuqELxa/7Hju3RV75b+zdYFSDirfDP1P4EOeUffH463wAJK+V9QcxsUCqjEyfz vAqEVa6aVHm58rRTIddJeM1yJR9f77kHXAB0gXrXOklypCPul8Cq4i/hGCUCM+FQfJ++ PWVQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:domainkey-signature; bh=AbCyrlMVxtFExEvwn074Cj50QCw50WDefmOdHOqkC0s=; b=az5ZJ3ZfmZ4dGJhl3yi2ZtJjEHHkfsj0VSwIPdfS5JJLS9T3DWW1ysKsbqUKljXMAk 6wq1Yngt7d0r80qMyI3PZ564BzNSG62nuNtKvm1e0rQZlle0j4wkY6sVuapTm4SEisT+ 2U0Liy5+JLknqwSkuqJ07SOq2MC8pWz7IcZGdkdbE5LKSEmx4FbbzGnx3wioCysLnAJE 6Bge6qeUhXAO170y+g7FF9S5fgB9rSPKfl/ZPAsd6VED5e0IT7beT2r2ImIzQB7aMZ5S hvcG65qC0LZWVse3CYuVYA0xNNB3JMZmHMqsWoQm54jIsHLbpAGDqwAzwgYomc4DA+1a mlSw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@zoho.com header.s=zm2020 header.b=eNoIDLXc; arc=pass (i=1 spf=pass spfdomain=zoho.com dkim=pass dkdomain=zoho.com dmarc=pass fromdomain=zoho.com>); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=zoho.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t9si3931322edq.488.2020.06.12.09.03.00; Fri, 12 Jun 2020 09:03:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@zoho.com header.s=zm2020 header.b=eNoIDLXc; arc=pass (i=1 spf=pass spfdomain=zoho.com dkim=pass dkdomain=zoho.com dmarc=pass fromdomain=zoho.com>); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=zoho.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726278AbgFLQAx (ORCPT + 99 others); Fri, 12 Jun 2020 12:00:53 -0400 Received: from sender4-pp-o92.zoho.com ([136.143.188.92]:25226 "EHLO sender4-pp-o92.zoho.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726053AbgFLQAx (ORCPT ); Fri, 12 Jun 2020 12:00:53 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1591977590; cv=none; d=zohomail.com; s=zohoarc; b=ATQJhj0fE03xuSNVt21N+EI8x9Em6KCI5bBIbxOkYI0W1s7DvVkeehXwcgYzHC5HpNjiMNcKJw8nxKIV6YhWgUvjRtnwqSEIRPwaMX8GU1yPEGSCopuZR1PvMjCMrQqXs/47ELzovLSxUj4eUXnGfJujTRhQYGbHSOk38Q8qIXc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591977590; h=Cc:Date:From:Message-ID:Subject:To; bh=AbCyrlMVxtFExEvwn074Cj50QCw50WDefmOdHOqkC0s=; b=fuCA20tyRes58chU5EVP7KuGNEgDQ1A3BkV7zOsOaSmmuNtTxfe8en+52yqtCnxdCsmQKL3E7Mx3X8J7B8A5trsvhinQUJqDMyv5/UY5ALynWsM4U4GHaTlXjNd+p+hxJmofGOJaQlcDvSjHus0uefx7WZDAz9csj3qTt/n+nDw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=zoho.com; spf=pass smtp.mailfrom=yehs2007@zoho.com; dmarc=pass header.from= header.from= DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=zapps768; d=zoho.com; h=from:to:cc:subject:date:message-id; b=jwib4dOSM4dN3RdXv+76K4G5TxQ+2UkhB8qPHsbvUdrrJ2zTmRf5BX66PW6cvNYcpcble5sSv1JL lZzNJRcGyyEmxucQTypF2ncMei/TrRY2NNc6/I7PfM9OSzbPyeO+ DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1591977590; s=zm2020; d=zoho.com; i=yehs2007@zoho.com; h=From:To:Cc:Subject:Date:Message-Id; bh=AbCyrlMVxtFExEvwn074Cj50QCw50WDefmOdHOqkC0s=; b=eNoIDLXcYUZA1jnq/kGKhMX7uuFz2EFIhfeKC4fpGtMxpNg7iS+ptLB2wgOAeJCn x6blyjT6/BlVGFZZxaeHYY6STACwc/oa6z3UCNA0Y3wovBaLaeBhx2aBbAlM0KLelfM Wv6GLvvl0LE8AhdjkWLet01cAMTFEPmjtxblsbbI= Received: from YEHS1XPF1D05WL.lenovo.com (111.197.254.230 [111.197.254.230]) by mx.zohomail.com with SMTPS id 15919775869391016.4366660991806; Fri, 12 Jun 2020 08:59:46 -0700 (PDT) From: Huaisheng Ye To: mpatocka@redhat.com, snitzer@redhat.com, agk@redhat.com Cc: dm-devel@redhat.com, linux-kernel@vger.kernel.org, Huaisheng Ye Subject: [PATCH] dm writecache: correct uncommitted_block when discarding uncommitted entry Date: Fri, 12 Jun 2020 23:59:11 +0800 Message-Id: <20200612155911.96528-1-yehs2007@zoho.com> X-Mailer: git-send-email 2.17.0.windows.1 X-ZohoMailClient: External Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Huaisheng Ye When uncommitted entry has been discarded, correct wc->uncommitted_block for getting the exact number. Signed-off-by: Huaisheng Ye --- drivers/md/dm-writecache.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/md/dm-writecache.c b/drivers/md/dm-writecache.c index 4367cc7..64b4527 100644 --- a/drivers/md/dm-writecache.c +++ b/drivers/md/dm-writecache.c @@ -855,6 +855,8 @@ static void writecache_discard(struct dm_writecache *wc, sector_t start, sector_ } discarded_something = true; } + if (!writecache_entry_is_committed(wc, e)) + wc->uncommitted_blocks--; writecache_free_entry(wc, e); } -- 1.8.3.1