|
@@ -447,7 +447,7 @@ static int disk_resume(struct dirty_log *log)
|
|
if (r)
|
|
if (r)
|
|
return r;
|
|
return r;
|
|
|
|
|
|
- /* set or clear any new bits */
|
|
|
|
|
|
+ /* set or clear any new bits -- device has grown */
|
|
if (lc->sync == NOSYNC)
|
|
if (lc->sync == NOSYNC)
|
|
for (i = lc->header.nr_regions; i < lc->region_count; i++)
|
|
for (i = lc->header.nr_regions; i < lc->region_count; i++)
|
|
/* FIXME: amazingly inefficient */
|
|
/* FIXME: amazingly inefficient */
|
|
@@ -457,6 +457,10 @@ static int disk_resume(struct dirty_log *log)
|
|
/* FIXME: amazingly inefficient */
|
|
/* FIXME: amazingly inefficient */
|
|
log_clear_bit(lc, lc->clean_bits, i);
|
|
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 */
|
|
/* copy clean across to sync */
|
|
memcpy(lc->sync_bits, lc->clean_bits, size);
|
|
memcpy(lc->sync_bits, lc->clean_bits, size);
|
|
lc->sync_count = count_bits32(lc->clean_bits, lc->bitset_uint32_count);
|
|
lc->sync_count = count_bits32(lc->clean_bits, lc->bitset_uint32_count);
|