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

Commit db305e50 authored by NeilBrown's avatar NeilBrown
Browse files

md: fix some (more) errors with bitmaps on devices larger than 2TB. 



If a write intent bitmap covers more than 2TB, we sometimes work with
values beyond 32bit, so these need to be sector_t.  This patches
add the required casts to some unsigned longs that are being shifted
up.

This will affect any raid10 larger than 2TB, or any raid1/4/5/6 with
member devices that are larger than 2TB.

Signed-off-by: default avatarNeilBrown <neilb@suse.de>
Reported-by: default avatar"Mario 'BitKoenig' Holbe" <Mario.Holbe@TU-Ilmenau.DE>
Cc: stable@kernel.org
parent 18055569

drivers/md/bitmap.c

+11 −7
Original line number Original line Diff line number Diff line
@@ -1013,9 +1013,11 @@ static int bitmap_init_from_disk(struct bitmap *bitmap, sector_t start) 
		kunmap_atomic(paddr, KM_USER0);

		kunmap_atomic(paddr, KM_USER0);

		if (b) {

		if (b) {

			/* if the disk bit is set, set the memory bit */

			/* if the disk bit is set, set the memory bit */

			bitmap_set_memory_bits(bitmap, i << CHUNK_BLOCK_SHIFT(bitmap),

			int needed = ((sector_t)(i+1) << (CHUNK_BLOCK_SHIFT(bitmap))

					       ((i+1) << (CHUNK_BLOCK_SHIFT(bitmap)) >= start)

				      >= start);

				);

			bitmap_set_memory_bits(bitmap,

					       (sector_t)i << CHUNK_BLOCK_SHIFT(bitmap),

					       needed);

			bit_cnt++;

			bit_cnt++;

			set_page_attr(bitmap, page, BITMAP_PAGE_CLEAN);

			set_page_attr(bitmap, page, BITMAP_PAGE_CLEAN);

		}

		}
@@ -1151,7 +1153,8 @@ void bitmap_daemon_work(struct bitmap *bitmap) 
			spin_lock_irqsave(&bitmap->lock, flags);

			spin_lock_irqsave(&bitmap->lock, flags);

			clear_page_attr(bitmap, page, BITMAP_PAGE_CLEAN);

			clear_page_attr(bitmap, page, BITMAP_PAGE_CLEAN);

		}

		}

		bmc = bitmap_get_counter(bitmap, j << CHUNK_BLOCK_SHIFT(bitmap),

		bmc = bitmap_get_counter(bitmap,

					 (sector_t)j << CHUNK_BLOCK_SHIFT(bitmap),

					 &blocks, 0);

					 &blocks, 0);

		if (bmc) {

		if (bmc) {

/*

/*
@@ -1166,7 +1169,8 @@ void bitmap_daemon_work(struct bitmap *bitmap) 
			} else if (*bmc == 1) {

			} else if (*bmc == 1) {

				/* we can clear the bit */

				/* we can clear the bit */

				*bmc = 0;

				*bmc = 0;

				bitmap_count_page(bitmap, j << CHUNK_BLOCK_SHIFT(bitmap),

				bitmap_count_page(bitmap,

						  (sector_t)j << CHUNK_BLOCK_SHIFT(bitmap),

						  -1);

						  -1);





				/* clear the bit */

				/* clear the bit */
@@ -1511,7 +1515,7 @@ void bitmap_dirty_bits(struct bitmap *bitmap, unsigned long s, unsigned long e) 
	unsigned long chunk;

	unsigned long chunk;





	for (chunk = s; chunk <= e; chunk++) {

	for (chunk = s; chunk <= e; chunk++) {

		sector_t sec = chunk << CHUNK_BLOCK_SHIFT(bitmap);

		sector_t sec = (sector_t)chunk << CHUNK_BLOCK_SHIFT(bitmap);

		bitmap_set_memory_bits(bitmap, sec, 1);

		bitmap_set_memory_bits(bitmap, sec, 1);

		bitmap_file_set_bit(bitmap, sec);

		bitmap_file_set_bit(bitmap, sec);

	}

	}