vol_id and RAID 1.0 metadata

[Scott James Remnant <scott@ubuntu.com>]

[-- Attachment #1.1.1: Type: text/plain, Size: 345 bytes --]

We've had a bug report filed for Ubuntu caused by vol_id not correctly
detecting a RAID1 with 1.0 metadata:

	https://bugs.launchpad.net/ubuntu/+source/udev/+bug/133773

A patch is attached to the bug (attached again here), does this seem a
reasonable fix?

Scott
-- 
Scott James Remnant
Ubuntu Development Manager
scott@ubuntu.com

[-- Attachment #1.1.2: udev-volid-md1.patch --]
[-- Type: text/x-patch, Size: 1278 bytes --]

diff -urp udev-113/extras/volume_id/lib/linux_raid.c udev-113.mod/extras/volume_id/lib/linux_raid.c
--- udev-113/extras/volume_id/lib/linux_raid.c	2007-06-24 01:44:48.000000000 +1000
+++ udev-113.mod/extras/volume_id/lib/linux_raid.c	2007-08-28 22:11:47.000000000 +1000
@@ -142,14 +142,21 @@ static int volume_id_probe_linux_raid1(s
 
 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 sboff1 =
+            (size & ~(MD_RESERVED_BYTES - 1)) - MD_RESERVED_BYTES;
+        uint64_t sboff2 =
+            size < 0x3000 ? 0x0400 : (size - 0x2000 & ~0x0e00);
 
 	/* version 0 at the end of the device */
-	if (volume_id_probe_linux_raid0(id, off + sboff, size) == 0)
+	if (volume_id_probe_linux_raid0(id, off + sboff1, size) == 0)
+		return 0;
+	if (volume_id_probe_linux_raid0(id, off + sboff2, size) == 0)
 		return 0;
 
 	/* version 1.0 at the end of the device */
-	if (volume_id_probe_linux_raid1(id, off + sboff, size) == 0)
+	if (volume_id_probe_linux_raid1(id, off + sboff1, size) == 0)
+		return 0;
+	if (volume_id_probe_linux_raid1(id, off + sboff2, size) == 0)
 		return 0;
 
 	/* version 1.1 at the start of the device */

[-- Attachment #1.2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

[-- Attachment #2: Type: text/plain, Size: 315 bytes --]

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/

[-- Attachment #3: Type: text/plain, Size: 226 bytes --]

_______________________________________________
Linux-hotplug-devel mailing list  http://linux-hotplug.sourceforge.net
Linux-hotplug-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel