From: Kay Sievers Date: Wed, 29 Aug 2007 04:06:00 +0000 (+0200) Subject: volume_id: fix linux_raid metadata version 1.0 detection X-Git-Tag: 174~1836 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=7b6fd01651ce89e4985f9afc344b7d49c4e5fcd7 volume_id: fix linux_raid metadata version 1.0 detection Fixes: https://bugs.launchpad.net/ubuntu/+source/udev/+bug/133773 --- diff --git a/extras/volume_id/lib/linux_raid.c b/extras/volume_id/lib/linux_raid.c index 6d1d19cb7..ff2c47c47 100644 --- a/extras/volume_id/lib/linux_raid.c +++ b/extras/volume_id/lib/linux_raid.c @@ -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;