X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fvolume_id%2Flib%2Flinux_raid.c;h=5e0c4a494f28f769823f09312a39053047e9b7f7;hp=6f37e2a35871b3d3dab63b3d3315432140673df7;hb=5caa40bea22b9ac07dbe667985d1b8556d8b6b80;hpb=4c13270a77d0a6b7c440af6f80e6dff4e078b3a6

diff --git a/extras/volume_id/lib/linux_raid.c b/extras/volume_id/lib/linux_raid.c
index 6f37e2a35..5e0c4a494 100644
--- a/extras/volume_id/lib/linux_raid.c
+++ b/extras/volume_id/lib/linux_raid.c
@@ -87,7 +87,7 @@ static int volume_id_probe_linux_raid0(struct volume_id *id, uint64_t off, uint6
 			uuid.ints[2] = 0;
 			uuid.ints[3] = 0;
 		}
-		volume_id_set_uuid(id, uuid.bytes, UUID_FOURINT);
+		volume_id_set_uuid(id, uuid.bytes, 0, UUID_MD);
 		snprintf(id->type_version, sizeof(id->type_version)-1, "%u.%u.%u",
 			 le32_to_cpu(mdp0->major_version),
 			 le32_to_cpu(mdp0->minor_version),
@@ -103,7 +103,7 @@ static int volume_id_probe_linux_raid0(struct volume_id *id, uint64_t off, uint6
 			uuid.ints[2] = 0;
 			uuid.ints[3] = 0;
 		}
-		volume_id_set_uuid(id, uuid.bytes, UUID_FOURINT);
+		volume_id_set_uuid(id, uuid.bytes, 0, UUID_MD);
 		snprintf(id->type_version, sizeof(id->type_version)-1, "%u.%u.%u",
 			 be32_to_cpu(mdp0->major_version),
 			 be32_to_cpu(mdp0->minor_version),
@@ -131,10 +131,12 @@ static int volume_id_probe_linux_raid1(struct volume_id *id, uint64_t off, uint6
 	if (le32_to_cpu(mdp1->magic) != MD_SB_MAGIC)
 		return -1;
 
-	volume_id_set_uuid(id, mdp1->set_uuid, UUID_FOURINT);
+	if (le32_to_cpu(mdp1->major_version) != 1)
+		return -1;
+
+	volume_id_set_uuid(id, mdp1->set_uuid, 0, UUID_MD);
 	volume_id_set_label_raw(id, mdp1->set_name, 32);
 	volume_id_set_label_string(id, mdp1->set_name, 32);
-	snprintf(id->type_version, sizeof(id->type_version)-1, "%u", le32_to_cpu(mdp1->major_version));
 	volume_id_set_usage(id, VOLUME_ID_RAID);
 	id->type = "linux_raid_member";
 	return 0;
@@ -142,23 +144,31 @@ 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 */
-	if (volume_id_probe_linux_raid1(id, off + sboff, size) == 0)
+	sboff = (size & ~(0x1000 - 1)) - 0x2000;
+	if (volume_id_probe_linux_raid1(id, off + sboff, size) == 0) {
+		strcpy(id->type_version, "1.0");
 		return 0;
+	}
 
 	/* version 1.1 at the start of the device */
-	if (volume_id_probe_linux_raid1(id, off, size) == 0)
+	if (volume_id_probe_linux_raid1(id, off, size) == 0) {
+		strcpy(id->type_version, "1.1");
 		return 0;
+	}
 
 	/* version 1.2 at 4k offset from the start */
-	if (volume_id_probe_linux_raid1(id, off + 0x1000, size) == 0)
+	if (volume_id_probe_linux_raid1(id, off + 0x1000, size) == 0) {
+		strcpy(id->type_version, "1.2");
 		return 0;
+	}
 
 	return -1;
 }