summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHuaisheng Ye <yehs1@lenovo.com>2020-06-12 23:59:11 +0800
committerSasha Levin <sashal@kernel.org>2020-06-30 15:37:12 -0400
commita51e71cbf6e64b170ef01a78f94df01cb46acb9b (patch)
tree7a73285c154dbb80c352659cc3ff3d0f7f9fb363
parentde1d70dad6f22b5d02c04e4d127463b51c727c2c (diff)
downloadgoldfish-a51e71cbf6e64b170ef01a78f94df01cb46acb9b.tar.gz
dm writecache: correct uncommitted_block when discarding uncommitted entry
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 <yehs1@lenovo.com> Acked-by: Mikulas Patocka <mpatocka@redhat.com> Signed-off-by: Mike Snitzer <snitzer@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/md/dm-writecache.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/md/dm-writecache.c b/drivers/md/dm-writecache.c
index 0d6ca723257f..64d75bbefda1 100644
--- a/drivers/md/dm-writecache.c
+++ b/drivers/md/dm-writecache.c
@@ -805,6 +805,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);
}