aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlasdair G Kergon <agk@redhat.com>2006-06-26 00:27:30 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-26 09:58:35 -0700
commit8a835f11bce68ed990533e49b5dedb00bee46d71 (patch)
tree8311b7c5b722fdf1a2b1c7267098ca0c05bd9a54
parent29121bd0b00ebb9524971a583fea4a2f7afe8041 (diff)
downloadmrst-s0i3-test-8a835f11bce68ed990533e49b5dedb00bee46d71.tar.gz
mrst-s0i3-test-8a835f11bce68ed990533e49b5dedb00bee46d71.tar.xz
mrst-s0i3-test-8a835f11bce68ed990533e49b5dedb00bee46d71.zip
[PATCH] dm mirror log: sync_count fix
When a mirror is reduced in size, clear the part of the bitmap that is no longer used. Signed-off-by: Alasdair G Kergon <agk@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/md/dm-log.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/md/dm-log.c b/drivers/md/dm-log.c
index 33d80721667..ba98bf57c7c 100644
--- a/drivers/md/dm-log.c
+++ b/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);