diff --git a/[refs] b/[refs]
index 9bf1d7047dd2..cdd75bf850c6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b7cca195c4cc051210f3e60a859b779ca833a2e4
+refs/heads/master: 29121bd0b00ebb9524971a583fea4a2f7afe8041
diff --git a/trunk/drivers/md/dm-log.c b/trunk/drivers/md/dm-log.c
index f52a78fc82bb..33d80721667c 100644
--- a/trunk/drivers/md/dm-log.c
+++ b/trunk/drivers/md/dm-log.c
@@ -295,10 +295,10 @@ static int create_log_context(struct dirty_log *log, struct dm_target *ti,
 	 * Work out how many "unsigned long"s we need to hold the bitset.
 	 */
 	bitset_size = dm_round_up(region_count,
-				  sizeof(unsigned long) << BYTE_SHIFT);
+				  sizeof(*lc->clean_bits) << BYTE_SHIFT);
 	bitset_size >>= BYTE_SHIFT;
 
-	lc->bitset_uint32_count = bitset_size / 4;
+	lc->bitset_uint32_count = bitset_size / sizeof(*lc->clean_bits);
 
 	/*
 	 * Disk log?