Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3087733ybt; Mon, 29 Jun 2020 15:02:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyc0sYqJZKqWSY4iTzYulUhcYvDVB8DG3WASMkE8FpMbHA+0K9vCyP8c04vcqWgHHz7Izvc X-Received: by 2002:a17:907:2654:: with SMTP id ar20mr14976474ejc.62.1593468168576; Mon, 29 Jun 2020 15:02:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593468168; cv=none; d=google.com; s=arc-20160816; b=E0sUnFt5qSlBaEsfqvNwWcniVqwkKPyT8GizJHtX9vTtnNF4LvH3jSf8ZM0ebyCD7/ lWIqX+2F/KDzAVS7nqQktuoprdnsEsiTkGCF/Uy+A4z1iW06kUT/BqjWba6x1QzZ7z0A PKA7XPcA4Y94Dn+aclDqBVRe4kx/XctTz1JjIz8TRtBkRY/HaCzwv22pAjrs4bNt4qe+ NAycDCSFSdpQbdccSe+Mpg19RdDsGR2lhFAUNiRvQ7RFyW2/XT8rsbEzSAoEQ6xh/oBg ild29D/eR1a944Nb5p7VcZgZKzvMvHfo8ZyTi7TL+v0Cyb8Jppmfv923vVkFarA3LVIY We+A== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=QTgR6SkA3qc5Yx/Nt2ozrM12aTa+bA467WK7iufiIZA=; b=1AYTGTkVRkLBROpQpG4Wl1hsOwa/HgWiDnidf5D5ohOlDPpZ1mx/o98Ec1m3BHE7Fh xC6UsTjzfVZUkm2yAVu0hukeH+ExviGAX0PhIJSFBhkHavBCTGkPRuXn/Qfm7Mkct/LI VkHT3az+jJA7Ru/tMgw7eS6YM0D9KYWs6mwweK5t6HhCivoes5dmO4EK2+K1SwQyYSKw 1UnVVYksxGWu5ThUSPWMgcbpKzWioVoAIR81ZE/uZSxJzCja/F28K25UQ4H2QCpeOkzq xS5L1CwKnDUtxe+izrkJcHCTgoe8tUKZ94KAtIyw38h2lBOxi5oB3L0LSgbAYCe714In fROA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=XiMNkk2c; 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=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i12si470963edq.340.2020.06.29.15.02.25; Mon, 29 Jun 2020 15:02:48 -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=@kernel.org header.s=default header.b=XiMNkk2c; 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=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391696AbgF2V7a (ORCPT + 99 others); Mon, 29 Jun 2020 17:59:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:56814 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726417AbgF2Sf0 (ORCPT ); Mon, 29 Jun 2020 14:35:26 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 721E4247F6; Mon, 29 Jun 2020 15:22:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593444157; bh=uviQsWIkzVEjKxiXQpBI13KBTZer+Ui33/dXmiadacw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XiMNkk2cEW/2Nbt+JkPwA6Yj9yvuUH2hEyTXR7bILb7LLSdlqyVVM3yKi93T0Nu9d tcSZpEOFu8fk6ajWH37p2N/G7jGcdtB9VNj72j/dnXJLSk7lkK0/udhF1p0Nc01H0k cx8kczshQ5ybFJl078wzriIOdIEUXPvRdQSXo2FI= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Huaisheng Ye , Mikulas Patocka , Mike Snitzer , Greg Kroah-Hartman Subject: [PATCH 5.7 263/265] dm writecache: correct uncommitted_block when discarding uncommitted entry Date: Mon, 29 Jun 2020 11:18:16 -0400 Message-Id: <20200629151818.2493727-264-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629151818.2493727-1-sashal@kernel.org> References: <20200629151818.2493727-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.7.7-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.7.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.7.7-rc1 X-KernelTest-Deadline: 2020-07-01T15:14+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Huaisheng Ye commit 39495b12ef1cf602e6abd350dce2ef4199906531 upstream. When uncommitted entry has been discarded, correct wc->uncommitted_block for getting the exact number. Fixes: 48debafe4f2fe ("dm: add writecache target") Cc: stable@vger.kernel.org Signed-off-by: Huaisheng Ye Acked-by: Mikulas Patocka Signed-off-by: Mike Snitzer Signed-off-by: Greg Kroah-Hartman --- 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 613c171b1b6d2..856b3515654ff 100644 --- a/drivers/md/dm-writecache.c +++ b/drivers/md/dm-writecache.c @@ -857,6 +857,8 @@ static void writecache_discard(struct dm_writecache *wc, sector_t start, sector_ writecache_wait_for_ios(wc, WRITE); discarded_something = true; } + if (!writecache_entry_is_committed(wc, e)) + wc->uncommitted_blocks--; writecache_free_entry(wc, e); } -- 2.25.1