Commit 505ec28d authored by Neil Brown's avatar Neil Brown Committed by Linus Torvalds

[PATCH] Fix md superblock incompatabilities with 2.4 kernels.

2.4 kernels are very fussy about some values in the superblock, and
2.6 got them wrong.  This fixes it.
parent f556ef00
...@@ -638,14 +638,13 @@ static void super_90_sync(mddev_t *mddev, mdk_rdev_t *rdev) ...@@ -638,14 +638,13 @@ static void super_90_sync(mddev_t *mddev, mdk_rdev_t *rdev)
/* make rdev->sb match mddev data.. /* make rdev->sb match mddev data..
* *
* 1/ zero out disks * 1/ zero out disks
* 2/ Add info for each disk, keeping track of highest desc_nr * 2/ Add info for each disk, keeping track of highest desc_nr (next_spare);
* 3/ any empty disks < highest become removed * 3/ any empty disks < next_spare become removed
* *
* disks[0] gets initialised to REMOVED because * disks[0] gets initialised to REMOVED because
* we cannot be sure from other fields if it has * we cannot be sure from other fields if it has
* been initialised or not. * been initialised or not.
*/ */
int highest = 0;
int i; int i;
int active=0, working=0,failed=0,spare=0,nr_disks=0; int active=0, working=0,failed=0,spare=0,nr_disks=0;
...@@ -716,17 +715,17 @@ static void super_90_sync(mddev_t *mddev, mdk_rdev_t *rdev) ...@@ -716,17 +715,17 @@ static void super_90_sync(mddev_t *mddev, mdk_rdev_t *rdev)
spare++; spare++;
working++; working++;
} }
if (rdev2->desc_nr > highest)
highest = rdev2->desc_nr;
} }
/* now set the "removed" bit on any non-trailing holes */ /* now set the "removed" and "faulty" bits on any missing devices */
for (i=0; i<highest; i++) { for (i=0 ; i < mddev->raid_disks ; i++) {
mdp_disk_t *d = &sb->disks[i]; mdp_disk_t *d = &sb->disks[i];
if (d->state == 0 && d->number == 0) { if (d->state == 0 && d->number == 0) {
d->number = i; d->number = i;
d->raid_disk = i; d->raid_disk = i;
d->state = (1<<MD_DISK_REMOVED); d->state = (1<<MD_DISK_REMOVED);
d->state |= (1<<MD_DISK_FAULTY);
failed++;
} }
} }
sb->nr_disks = nr_disks; sb->nr_disks = nr_disks;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment