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

Commit 2f05af8b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull one more md bugfix from NeilBrown:
 "Fix bug in recent fix to RAID10.

  Without this patch, recovery will crash"

* tag 'md-3.4-fixes' of git://neil.brown.name/md:
  md/raid10: fix transcription error in calc_sectors conversion.
parents 8394edf3 b0d634d5

drivers/md/raid10.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -3189,7 +3189,7 @@ static void calc_sectors(struct r10conf *conf, sector_t size) 
	if (conf->far_offset)

	if (conf->far_offset)

		conf->stride = 1 << conf->chunk_shift;

		conf->stride = 1 << conf->chunk_shift;

	else {

	else {

		sector_div(size, conf->near_copies);

		sector_div(size, conf->far_copies);

		conf->stride = size << conf->chunk_shift;

		conf->stride = size << conf->chunk_shift;

	}

	}

}

}