summaryrefslogtreecommitdiff
path: root/extras
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2007-08-29 06:06:00 +0200
committerKay Sievers <kay.sievers@vrfy.org>2007-08-29 06:06:00 +0200
commit7b6fd01651ce89e4985f9afc344b7d49c4e5fcd7 (patch)
treed0e46866b249aaa889705e67dad7b5ccba40d58b /extras
parentdbb2c414d77362a9279f4fc50458054f71ffb7e2 (diff)
volume_id: fix linux_raid metadata version 1.0 detection
Fixes: https://bugs.launchpad.net/ubuntu/+source/udev/+bug/133773
Diffstat (limited to 'extras')
-rw-r--r--extras/volume_id/lib/linux_raid.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/extras/volume_id/lib/linux_raid.c b/extras/volume_id/lib/linux_raid.c
index 6d1d19cb74..ff2c47c473 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;