Commit 74de82ed authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://neil.brown.name/md 

* 'for-linus' of git://neil.brown.name/md:
  md: check return code of read_sb_page
  md/raid1: minor bio initialisation improvements.
  md/raid1:  avoid overflow in raid1 resync when bitmap is in use.
parents dda9cd9f 5c04f551

drivers/md/bitmap.c

+5 −4
Original line number Diff line number Diff line
@@ -1000,7 +1000,8 @@ static int bitmap_init_from_disk(struct bitmap *bitmap, sector_t start) 
				page = bitmap->sb_page;

				offset = sizeof(bitmap_super_t);

				if (!file)

					read_sb_page(bitmap->mddev,

					page = read_sb_page(

						bitmap->mddev,

						bitmap->mddev->bitmap_info.offset,

						page,

						index, count);

drivers/md/raid1.c

+3 −1
Original line number Diff line number Diff line
@@ -1839,7 +1839,9 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i 


		/* take from bio_init */

		bio->bi_next = NULL;

		bio->bi_flags &= ~(BIO_POOL_MASK-1);

		bio->bi_flags |= 1 << BIO_UPTODATE;

		bio->bi_comp_cpu = -1;

		bio->bi_rw = READ;

		bio->bi_vcnt = 0;

		bio->bi_idx = 0;
@@ -1912,7 +1914,7 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i 
			    !test_bit(MD_RECOVERY_REQUESTED, &mddev->recovery))

				break;

			BUG_ON(sync_blocks < (PAGE_SIZE>>9));

			if (len > (sync_blocks<<9))

			if ((len >> 9) > sync_blocks)

				len = sync_blocks<<9;

		}