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

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

[PATCH] md: set desc_nr correctly for version-1 superblocks 



This has to be done in ->load_super, not ->validate_super

Without this, hot-adding devices to an array doesn't always
work right - though there is a work around in mdadm-2.5.2 to
make this less of an issue.

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 f4370781

drivers/md/md.c

+5 −1
Original line number Diff line number Diff line
@@ -1062,6 +1062,11 @@ static int super_1_load(mdk_rdev_t *rdev, mdk_rdev_t *refdev, int minor_version) 
	if (rdev->sb_size & bmask)

		rdev-> sb_size = (rdev->sb_size | bmask)+1;



	if (sb->level == cpu_to_le32(LEVEL_MULTIPATH))

		rdev->desc_nr = -1;

	else

		rdev->desc_nr = le32_to_cpu(sb->dev_number);



	if (refdev == 0)

		ret = 1;

	else {
@@ -1171,7 +1176,6 @@ static int super_1_validate(mddev_t *mddev, mdk_rdev_t *rdev) 
	}

	if (mddev->level != LEVEL_MULTIPATH) {

		int role;

		rdev->desc_nr = le32_to_cpu(sb->dev_number);

		role = le16_to_cpu(sb->dev_roles[rdev->desc_nr]);

		switch(role) {

		case 0xffff: /* spare */