From: NeilBrown Date: Mon, 10 Jul 2006 11:44:14 +0000 (-0700) Subject: [PATCH] md: set desc_nr correctly for version-1 superblocks X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=31b65a0d3894566191b91fbadd122c354a363b5d;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git [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: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/drivers/md/md.c b/drivers/md/md.c index e4e161372a3..9f76e0cd780 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -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 */