GELI + sync issue

[Peter Thoenen]

Hallo,

Recently updated to 6.2RC1 and upon reboot GELI is now asking me for a
password when it attempts to mount /dev/ad0.  This is left over from an
old atempt at removable fulldisk encryption that is no longer used.  I
can type the password wrong 3 time and then it mounts /dev/ad0 as
normal.

Trying to figure out how correct this.  'geli dump /dev/ad0' lists the
metadata (namely the -b problem) but a 'geli kill /dev/ad0' states
"Userland and kernel parts are out of sync" (I also get his prob when I
attempt to mount a geli swap partition)

I don't think I am actually out of sync though as uname -a gives proper
output and I have gone through the src/UPDATING and FBSD Handbook
building world process 3 times now.  All appears to be working except
this.  Anybody have any pointers on how to fix and do so w/o losing my
current data.

Some fun outputs:

#bsdlabel /dev/ad0
bsdlabel: /dev/ad0: no valid label found

#geli kill -v /dev/ad0
Userland and kernel parts are out of sync.

#fdisk
******* Working on device /dev/ad0 *******
parameters extracted from in-core disklabel are:
cylinders=155061 heads=16 sectors/track=63 (1008 blks/cyl)

Figures below won't work with BIOS for partitions not in cyl 1
parameters to be used for BIOS calculations are:
cylinders=155061 heads=16 sectors/track=63 (1008 blks/cyl)

Media sector size is 512
Warning: BIOS sector numbering starts with sector 1
Information from DOS bootblock is:
The data for partition 1 is:
sysid 165 (0xa5),(FreeBSD/NetBSD/386BSD)
    start 63, size 156296322 (76316 Meg), flag 80 (active)
        beg: cyl 0/ head 1/ sector 1;
        end: cyl 1023/ head 254/ sector 63
The data for partition 2 is:
<UNUSED>
The data for partition 3 is:
<UNUSED>
The data for partition 4 is:
<UNUSED>

# # geli dump /dev/ad0   
Metadata on /dev/ad0:
     magic: GEOM::ELI
   version: 0
     flags: 0x2
      algo: AES
    keylen: 256
  provsize: 80026361856
sectorsize: 4096
      keys: 0x01
iterations: 66523
      Salt: blah
Master Key: blah
  MD5 hash: blah