raidframe problem after upgrade

[Manuel Bouyer <bouyer%antioche.eu.org@localhost>]

Hello,
after upgrading a server from 5.0_STABLE to 5.1_STABLE, I've seen
(after a clean reboot):
raid8: RAID Level 1
raid8: Components: component0[**FAILED**] /dev/sd40e
raid8: Total Sectors: 9644113792 (4709039 MB)
raid8: WARNING: raid8: total sector size in disklabel (1054179200) != the size 
of raid (9644113792)
raid15: RAID Level 1
raid15: Components: /dev/sd80e component1[**FAILED**]
raid15: Total Sectors: 1054179200 (514735 MB)

sd40e and sd80e are both part of raid8, raid15 should not be there. Also, the
size of the raid is wrong: it should be 514735MB and not 4709039MB
(500GB, not 4TB). 

After destroying raid15 and wipping out the first 64MB of /dev/sd80e,
when trying to add it as a hot spare, I get:
Spare disk /dev/sd80e (512 blocks) is too small to serve as a spare (need 
9644113792 blocks)

Any idea how to fix this ? is it related to 32 vs 64bits issues that did
show up some time ago ?

here is the disklabel of sd80 and sd40 (both are identical):
bytes/sector: 512
sectors/track: 128
tracks/cylinder: 128
sectors/cylinder: 16384
cylinders: 25000
total sectors: 1464483840
rpm: 3600
interleave: 1
trackskew: 0
cylinderskew: 0
headswitch: 0           # microseconds
track-to-track seek: 0  # microseconds
drivedata: 0 

5 partitions:
#        size    offset     fstype [fsize bsize cpg/sgs]
 a: 409600000         0       RAID                     # (Cyl.      0 -  24999)
 d: 1464483840         0     unused      0     0        # (Cyl.      0 -  89384)
 e: 1054883840 409600000       RAID                     # (Cyl.  25000 -  89384)


-- 
Manuel Bouyer <bouyer%antioche.eu.org@localhost>
     NetBSD: 26 ans d'experience feront toujours la difference
--