---

yaml
---
r: 30347
b: refs/heads/master
c: 8a835f1
h: refs/heads/master
i:
  30345: c7d7bdf
  30343: ec55092
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29121bd0b00ebb9524971a583fea4a2f7afe8041
+refs/heads/master: 8a835f11bce68ed990533e49b5dedb00bee46d71

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);