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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 0F5E8C433E0 for ; Mon, 29 Jun 2020 21:59:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E5266206A5 for ; Mon, 29 Jun 2020 21:59:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593467960; bh=uviQsWIkzVEjKxiXQpBI13KBTZer+Ui33/dXmiadacw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=H/ex+6Y/wVaOsA4DXDSe3EWh59ZupLN1fY05oI6MAqNR2dt8W657+B9pVZiJ90q09 8id41I3+vPrwpJ/oeWPvY1yDOdEFRkgn5SMa0roV+T+q/8X+QOvKHBGC6GhlrpfcPI iy5nMRyNyT3DVKCRdIhHqKHeOUHvv7PY5FUfIeKc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404669AbgF2V7T (ORCPT ); Mon, 29 Jun 2020 17:59:19 -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: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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