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

Commit e42bd6e4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'md-3.4-fixes' of git://neil.brown.name/md 

Pull a few more fixes for md from NeilBrown:
 "Two are tagged for -stable.  They can cause an oops, but very rarely."

* tag 'md-3.4-fixes' of git://neil.brown.name/md:
  md/bitmap: prevent bitmap_daemon_work running while initialising bitmap
  md/raid1,raid10: Fix calculation of 'vcnt' when processing error recovery.
  MD: Bitmap version cleanup.
parents 7e066489 afbaa90b

drivers/md/bitmap.c

+2 −3
Original line number Diff line number Diff line
@@ -539,9 +539,6 @@ static int bitmap_new_disk_sb(struct bitmap *bitmap) 
	bitmap->events_cleared = bitmap->mddev->events;

	sb->events_cleared = cpu_to_le64(bitmap->mddev->events);



	bitmap->flags |= BITMAP_HOSTENDIAN;

	sb->version = cpu_to_le32(BITMAP_MAJOR_HOSTENDIAN);



	kunmap_atomic(sb);



	return 0;
@@ -1788,7 +1785,9 @@ int bitmap_load(struct mddev *mddev) 
		 * re-add of a missing device */

		start = mddev->recovery_cp;



	mutex_lock(&mddev->bitmap_info.mutex);

	err = bitmap_init_from_disk(bitmap, start);

	mutex_unlock(&mddev->bitmap_info.mutex);



	if (err)

		goto out;

drivers/md/raid1.c

+2 −1
Original line number Diff line number Diff line
@@ -1712,6 +1712,7 @@ static int process_checks(struct r1bio *r1_bio) 
	struct r1conf *conf = mddev->private;

	int primary;

	int i;

	int vcnt;



	for (primary = 0; primary < conf->raid_disks * 2; primary++)

		if (r1_bio->bios[primary]->bi_end_io == end_sync_read &&
@@ -1721,9 +1722,9 @@ static int process_checks(struct r1bio *r1_bio) 
			break;

		}

	r1_bio->read_disk = primary;

	vcnt = (r1_bio->sectors + PAGE_SIZE / 512 - 1) >> (PAGE_SHIFT - 9);

	for (i = 0; i < conf->raid_disks * 2; i++) {

		int j;

		int vcnt = r1_bio->sectors >> (PAGE_SHIFT- 9);

		struct bio *pbio = r1_bio->bios[primary];

		struct bio *sbio = r1_bio->bios[i];

		int size;

drivers/md/raid10.c

+2 −2
Original line number Diff line number Diff line
@@ -1788,6 +1788,7 @@ static void sync_request_write(struct mddev *mddev, struct r10bio *r10_bio) 
	struct r10conf *conf = mddev->private;

	int i, first;

	struct bio *tbio, *fbio;

	int vcnt;



	atomic_set(&r10_bio->remaining, 1);
@@ -1802,10 +1803,10 @@ static void sync_request_write(struct mddev *mddev, struct r10bio *r10_bio) 
	first = i;

	fbio = r10_bio->devs[i].bio;



	vcnt = (r10_bio->sectors + (PAGE_SIZE >> 9) - 1) >> (PAGE_SHIFT - 9);

	/* now find blocks with errors */

	for (i=0 ; i < conf->copies ; i++) {

		int  j, d;

		int vcnt = r10_bio->sectors >> (PAGE_SHIFT-9);



		tbio = r10_bio->devs[i].bio;
@@ -1871,7 +1872,6 @@ static void sync_request_write(struct mddev *mddev, struct r10bio *r10_bio) 
	 */

	for (i = 0; i < conf->copies; i++) {

		int j, d;

		int vcnt = r10_bio->sectors >> (PAGE_SHIFT-9);



		tbio = r10_bio->devs[i].repl_bio;

		if (!tbio || !tbio->bi_end_io)