Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06a24ddb authored by Mikulas Patocka's avatar Mikulas Patocka Committed by Greg Kroah-Hartman
Browse files

dm mirror log: clear log bits up to BITS_PER_LONG boundary 



commit 90736eb3232d208ee048493f371075e4272e0944 upstream.

Commit 85e123c27d5c ("dm mirror log: round up region bitmap size to
BITS_PER_LONG") introduced a regression on 64-bit architectures in the
lvm testsuite tests: lvcreate-mirror, mirror-names and vgsplit-operation.

If the device is shrunk, we need to clear log bits beyond the end of the
device. The code clears bits up to a 32-bit boundary and then calculates
lc->sync_count by summing set bits up to a 64-bit boundary (the commit
changed that; previously, this boundary was 32-bit too). So, it was using
some non-zeroed bits in the calculation and this caused misbehavior.

Fix this regression by clearing bits up to BITS_PER_LONG boundary.

Fixes: 85e123c27d5c ("dm mirror log: round up region bitmap size to BITS_PER_LONG")
Cc: stable@vger.kernel.org
Reported-by: default avatarBenjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: default avatarMikulas Patocka <mpatocka@redhat.com>
Signed-off-by: default avatarMike Snitzer <snitzer@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1f350f3c

drivers/md/dm-log.c

+1 −1
Original line number Diff line number Diff line
@@ -615,7 +615,7 @@ static int disk_resume(struct dm_dirty_log *log) 
			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++)

	for (i = lc->region_count; i % BITS_PER_LONG; i++)

		log_clear_bit(lc, lc->clean_bits, i);



	/* copy clean across to sync */