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

Commit f9abd1ac authored by NeilBrown's avatar NeilBrown Committed by Linus Torvalds
Browse files

[PATCH] md: Fix a bug that recently crept into md/linear 



A recent patch that allowed linear arrays to be reconfigured on-line
allowed in a bug which results in divide by zero - not all
mddev->array_size were converted to conf->array_size.

This patch finished the conversion and fixed the bug.

The offending patch was commit 7c7546cc.

Thanks to Simon Kirby <sim@netnation.com> for the bug report.

Cc: Simon Kirby <sim@netnation.com>
Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent af2bc7d2

drivers/md/linear.c

+3 −3
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ static linear_conf_t *linear_conf(mddev_t *mddev, int raid_disks) 
		goto out;

	}



	min_spacing = mddev->array_size;

	min_spacing = conf->array_size;

	sector_div(min_spacing, PAGE_SIZE/sizeof(struct dev_info *));



	/* min_spacing is the minimum spacing that will fit the hash
@@ -171,7 +171,7 @@ static linear_conf_t *linear_conf(mddev_t *mddev, int raid_disks) 
	 * that is larger than min_spacing as use the size of that as

	 * the actual spacing

	 */

	conf->hash_spacing = mddev->array_size;

	conf->hash_spacing = conf->array_size;

	for (i=0; i < cnt-1 ; i++) {

		sector_t sz = 0;

		int j;
@@ -228,7 +228,7 @@ static linear_conf_t *linear_conf(mddev_t *mddev, int raid_disks) 
	curr_offset = 0;

	i = 0;

	for (curr_offset = 0;

	     curr_offset < mddev->array_size;

	     curr_offset < conf->array_size;

	     curr_offset += conf->hash_spacing) {



		while (i < mddev->raid_disks-1 &&