volume_id: fix linux_raid metadata version 1.0 detection

Fixes:
  https://bugs.launchpad.net/ubuntu/+source/udev/+bug/133773
This commit is contained in:
Kay Sievers
2007-08-29 06:06:00 +02:00
parent dbb2c414d7
commit 7b6fd01651

View File

@@ -142,13 +142,15 @@ static int volume_id_probe_linux_raid1(struct volume_id *id, uint64_t off, uint6
int volume_id_probe_linux_raid(struct volume_id *id, uint64_t off, uint64_t size)
{
uint64_t sboff = (size & ~(MD_RESERVED_BYTES - 1)) - MD_RESERVED_BYTES;
uint64_t sboff;
/* version 0 at the end of the device */
sboff = (size & ~(MD_RESERVED_BYTES - 1)) - MD_RESERVED_BYTES;
if (volume_id_probe_linux_raid0(id, off + sboff, size) == 0)
return 0;
/* version 1.0 at the end of the device */
sboff = (size & ~(0x1000 - 1)) - 0x2000;
if (volume_id_probe_linux_raid1(id, off + sboff, size) == 0)
return 0;