From f998633badec7964fa4bde08bb4833de18c89a7a Mon Sep 17 00:00:00 2001
From: Alasdair G Kergon <agk@redhat.com>
Date: Mon, 26 Jun 2006 00:27:30 -0700
Subject: [PATCH] --- yaml --- r: 30347 b: refs/heads/master c:
 8a835f11bce68ed990533e49b5dedb00bee46d71 h: refs/heads/master i:   30345:
 c7d7bdf575a1964a7bb54996ee5c0ec22c66b8bf   30343:
 ec5509275f52651de54d51bdc4ea292f3c3f3866 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/md/dm-log.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index cdd75bf850c6..96776f2be59b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29121bd0b00ebb9524971a583fea4a2f7afe8041
+refs/heads/master: 8a835f11bce68ed990533e49b5dedb00bee46d71
diff --git a/trunk/drivers/md/dm-log.c b/trunk/drivers/md/dm-log.c
index 33d80721667c..ba98bf57c7c0 100644
--- a/trunk/drivers/md/dm-log.c
+++ b/trunk/drivers/md/dm-log.c
@@ -447,7 +447,7 @@ static int disk_resume(struct dirty_log *log)
 	if (r)
 		return r;
 
-	/* set or clear any new bits */
+	/* set or clear any new bits -- device has grown */
 	if (lc->sync == NOSYNC)
 		for (i = lc->header.nr_regions; i < lc->region_count; i++)
 			/* FIXME: amazingly inefficient */
@@ -457,6 +457,10 @@ static int disk_resume(struct dirty_log *log)
 			/* FIXME: amazingly inefficient */
 			log_clear_bit(lc, lc->clean_bits, i);
 
+	/* clear any old bits -- device has shrunk */
+	for (i = lc->region_count; i % (sizeof(*lc->clean_bits) << BYTE_SHIFT); i++)
+		log_clear_bit(lc, lc->clean_bits, i);
+
 	/* copy clean across to sync */
 	memcpy(lc->sync_bits, lc->clean_bits, size);
 	lc->sync_count = count_bits32(lc->clean_bits, lc->bitset_uint32_count);